From 5b4181ed8b6f96fc3d458e9a22bd7e673f8e447e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sat, 8 Aug 2015 05:43:16 +0200
Subject: [PATCH] De-lint recipes

*	teeworlds
	Don't start SUMMARY with app name
	Re-ordered blocks

*	textsaver
	Don't start SUMMARY with app name
	Re-ordered blocks
	Corrected PROVIDES from apps to addon

*	tiff
	Don't start SUMMARY with app name
	Re-ordered blocks
	Removed duplicate REVISION

*	timecop
	Don't start SUMMARY with app name
	Re-ordered blocks

*	transmission
	Don't start SUMMARY with app name
	Re-ordered blocks

*	twolame
	Don't start SUMMARY with app name
	Re-ordered blocks

*	x264
	Don't start SUMMARY with app name
	Re-ordered blocks

*	xemacs
	Don't start SUMMARY with app name
	Re-ordered blocks

*	xextproto
	Don't start SUMMARY with app name
	Improved SUMMARY and DESCRIPTION
	Re-ordered blocks

*	xtrans
	Don't start SUMMARY with app name
	Improved SUMMARY and DESCRIPTION
	Re-ordered blocks

*	zoo
	Don't start SUMMARY with app name
	Still in old BEP format

*	zsh
	Don't start SUMMARY with app name
	Re-ordered blocks
---
 app-arch/zoo/zoo-2.10.recipe                  |   2 +-
 app-editors/xemacs/xemacs-21.5_hg.recipe      |  16 +--
 app-shells/zsh/zsh-5.0.7.recipe               |  14 ++-
 games-action/teeworlds/teeworlds-0.6.3.recipe |  20 ++-
 haiku-apps/textsaver/textsaver-1.0.recipe     |  27 ++--
 haiku-apps/timecop/timecop-0.61.recipe        |  17 +--
 media-libs/tiff/tiff-3.9.6.recipe             | 119 +++++++++---------
 media-libs/x264/x264-20140308.recipe          |  40 +++---
 media-sound/twolame/twolame-0.3.13.recipe     |  49 ++++----
 net-p2p/transmission/transmission-2.82.recipe |   2 +-
 net-p2p/transmission/transmission-2.84.recipe |   2 +-
 x11-libs/xtrans/xtrans-1.2.5.recipe           |  21 ++--
 x11-proto/xextproto/xextproto-7.1.1.recipe    |  30 +++--
 13 files changed, 173 insertions(+), 186 deletions(-)

diff --git a/app-arch/zoo/zoo-2.10.recipe b/app-arch/zoo/zoo-2.10.recipe
index 81d8d0b6c..85fe6fb69 100644
--- a/app-arch/zoo/zoo-2.10.recipe
+++ b/app-arch/zoo/zoo-2.10.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Zoo archive utility"
+SUMMARY="An archive utility using LZW compression"
 DESCRIPTION="
 Zoo is a compression utility. It uses LZW compression algorithm \
 which compresses files to 20-80% of their original size depending on the data type. \
diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe
index 44987fd3f..bf6a0042d 100644
--- a/app-editors/xemacs/xemacs-21.5_hg.recipe
+++ b/app-editors/xemacs/xemacs-21.5_hg.recipe
@@ -1,17 +1,17 @@
-SUMMARY="XEmacs editor"
-DESCRIPTION="
-highly customizable open source text editor and application development system
-"
+SUMMARY="The famous XEmacs editor"
+DESCRIPTION="A highly customizable open source text editor and application \
+development system."
 HOMEPAGE="http://xemacs.org/"
-SOURCE_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953"
-REVISION="1"
-LICENSE="GNU GPL v3"
 COPYRIGHT="1998-2000 Hrvoje Niksic
 	2000-2001 Michael Sperber
 	2001 Ben Wing
 	2001 Didier Verna
 	2004 Stephen Turnbull
 	2005-2006 Aidan Kehoe"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953"
+
 # TODO: FIXME:
 #Bootstrapping from temacs...
 #Warning:
@@ -34,6 +34,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 #POLICY WARNING: no matching provides "cmd:ootags" for "bin/ootags"
 #POLICY WARNING: no matching provides "cmd:xemacs_21.5_b34" for "bin/xemacs-21.5-b34"
 #POLICY WARNING: no matching provides "cmd:xemacs_script" for "bin/xemacs-script
+
 PROVIDES="
 	xemacs$secondaryArchSuffix = $portVersion
 	app:xemacs = $portVersion
@@ -49,6 +50,7 @@ REQUIRES="
 #	lib:libtiff$secondaryArchSuffix
 #	lib:libxpm$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
diff --git a/app-shells/zsh/zsh-5.0.7.recipe b/app-shells/zsh/zsh-5.0.7.recipe
index 8c8f45d30..c9326f56c 100644
--- a/app-shells/zsh/zsh-5.0.7.recipe
+++ b/app-shells/zsh/zsh-5.0.7.recipe
@@ -1,16 +1,19 @@
-SUMMARY="Zsh is a UNIX command interpreter (shell)"
+SUMMARY="A UNIX command interpreter (shell)"
 DESCRIPTION="Zsh is a shell designed for interactive use, although it \
 is also a powerful scripting language. Many of the useful features of \
 bash, ksh, and tcsh were incorporated into zsh; many original features \
 were added."
 HOMEPAGE="http://www.zsh.org"
+COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
+Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
-COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others."
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2"
 CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
 PATCHES="zsh-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	zsh = $portVersion compat >= 5
 	cmd:zsh = $portVersion compat >= 5
@@ -22,12 +25,13 @@ REQUIRES="
 	lib:libncurses
 	lib:libpcre
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libncurses
 	devel:libpcre
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:autoconf
 	cmd:find
 	cmd:gcc
diff --git a/games-action/teeworlds/teeworlds-0.6.3.recipe b/games-action/teeworlds/teeworlds-0.6.3.recipe
index 9103ad36c..020144ab8 100644
--- a/games-action/teeworlds/teeworlds-0.6.3.recipe
+++ b/games-action/teeworlds/teeworlds-0.6.3.recipe
@@ -1,25 +1,24 @@
-SUMMARY="Teeworlds is a retro multiplayer shooter"
+SUMMARY="A retro multiplayer shooter"
 DESCRIPTION="Teeworlds is a free online multiplayer game, available for \
 all major operating systems. Battle with up to 16 players in a variety of \
 game modes, including Team Deathmatch and Capture The Flag. You can even \
 design your own maps!"
-
+HOMEPAGE="https://www.teeworlds.com"
 LICENSE="Zlib"
 COPYRIGHT="2007-2012 Magnus Auvinen"
-
-ARCHITECTURES="!x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86"
 REVISION="1"
-HOMEPAGE="https://www.teeworlds.com"
 SOURCE_URI="https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz"
 CHECKSUM_SHA256="490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b"
 SOURCE_DIR="teeworlds-0.6.3-src"
+PATCHES="teeworlds-0.6.3.patch"
+
+ARCHITECTURES="!x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	teeworlds$secondaryArchSuffix = $portVersion
 	cmd:teeworlds$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libGL$secondaryArchSuffix
@@ -27,10 +26,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libsdl$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
@@ -40,8 +38,6 @@ BUILD_PREREQUIRES="
 	cmd:python
 	"
 
-PATCHES="teeworlds-0.6.3.patch"
-
 BUILD()
 {
 	bam release
diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe
index 12d312c77..f0ceb203f 100644
--- a/haiku-apps/textsaver/textsaver-1.0.recipe
+++ b/haiku-apps/textsaver/textsaver-1.0.recipe
@@ -1,30 +1,27 @@
-SUMMARY="TextSaver screensaver"
+SUMMARY="A screensaver displaying some text"
 DESCRIPTION="Displays your text at random locations in random colors."
 HOMEPAGE="https://github.com/bbjimmy/TextSaver"
+COPYRIGHT="2002 Marcus Overhagen
+	2004-2013 Jim Saxton, FAT ELK SOFTWARE"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/bbjimmy/TextSaver/archive/1.0.tar.gz"
 CHECKSUM_SHA256="00ecaba878786fce07620946124bdb42ec52e9d1c597cc2a876355229a786747"
 SOURCE_DIR="TextSaver-1.0"
 
-LICENSE="MIT"
-COPYRIGHT="2002 Marcus Overhagen
- 2004-2013 Jim Saxton, FAT ELK SOFTWARE
-"
-
-REVISION="1"
-
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	testsaver = $portVersion
-	app:textsaver = $portVersion
+	addon:textsaver = $portVersion
+	"
+REQUIRES="
+	haiku
 	"
 
-REQUIRES="
-	haiku"
-
 BUILD_REQUIRES="
-	haiku_devel"
-
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
@@ -39,7 +36,6 @@ BUILD()
 
 INSTALL()
 {
-
 	mkdir -p $addOnsDir/Screen\ Savers
 	cd source
 	cp TextSaver $addOnsDir/Screen\ Savers/TextSaver
@@ -48,5 +44,4 @@ INSTALL()
 	unzip -o fatelk
 	cp "FAT ELK" $dataDir/FatElk/
 	cp "Fat Elk" $dataDir/FatElk/
-
 }
diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe
index 7fb6bceef..3fcc6bfd1 100644
--- a/haiku-apps/timecop/timecop-0.61.recipe
+++ b/haiku-apps/timecop/timecop-0.61.recipe
@@ -1,15 +1,15 @@
-SUMMARY="TimeCop helps you collect statistics about your computer usage"
-DESCRIPTION="
-You want to know, how much time you spend in front of your computer?
+SUMMARY="A tool to collect statistics about your computer usage"
+DESCRIPTION="You want to know, how much time you spend in front of your \
+computer?
 You want to know, how often your computer crashes?
 
-You can use TimeCop to write a protocol of your computer sessions.
-"
+TimeCop writes a protocol of your computer sessions."
 HOMEPAGE="http://www.augusta.de/michael/BeOS/TimeCop/index.us.html"
-SOURCE_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895"
-REVISION="2"
-LICENSE="GNU GPL v2"
 COPYRIGHT="Michael Pieper"
+LICENSE="GNU GPL v2"
+REVISION="2"
+SOURCE_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895"
+
 ARCHITECTURES="x86_gcc2 x86 !ppc"
 CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94"
 
@@ -20,6 +20,7 @@ PROVIDES="
 	cmd:TimeCop_daemon = $portVersion
 	app:TimeCop = $portVersion
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe
index d8bcc4862..383bceac7 100644
--- a/media-libs/tiff/tiff-3.9.6.recipe
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -1,23 +1,19 @@
-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 red/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-3.9.6.tar.gz"
-CHECKSUM_SHA256="0fba119156236074343a14afbd3a47907e3a5952c9c86102305d4eeb06ad6833"
-REVISION="1"
-LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."
-
+LICENSE="MIT"
 REVISION="2"
+SOURCE_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz"
+CHECKSUM_SHA256="0fba119156236074343a14afbd3a47907e3a5952c9c86102305d4eeb06ad6833"
+PATCHES="tiff-${portVersion}.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="tiff-${portVersion}.patchset"
-
 PROVIDES="
 	tiff$secondaryArchSuffix = $portVersion compat >= 3
 	lib:libtiff$secondaryArchSuffix = $portVersion compat >= 3
@@ -28,12 +24,58 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 3
+	devel:libtiff$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	tiff$secondaryArchSuffix == $portVersion base
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The TIFF tools"
+	PROVIDES_tools="
+		tiff_tools = $portVersion compat >= 3
+		cmd:bmp2tiff = $portVersion compat >= 3
+		cmd:fax2ps = $portVersion compat >= 3
+		cmd:fax2tiff = $portVersion compat >= 3
+		cmd:gif2tiff = $portVersion compat >= 3
+		cmd:pal2rgb = $portVersion compat >= 3
+		cmd:ppm2tiff = $portVersion compat >= 3
+		cmd:ras2tiff = $portVersion compat >= 3
+		cmd:raw2tiff = $portVersion compat >= 3
+		cmd:rgb2ycbcr = $portVersion compat >= 3
+		cmd:thumbnail = $portVersion compat >= 3
+		cmd:tiff2bw = $portVersion compat >= 3
+		cmd:tiff2pdf = $portVersion compat >= 3
+		cmd:tiff2ps = $portVersion compat >= 3
+		cmd:tiff2rgba = $portVersion compat >= 3
+		cmd:tiffcmp = $portVersion compat >= 3
+		cmd:tiffcp = $portVersion compat >= 3
+		cmd:tiffcrop = $portVersion compat >= 3
+		cmd:tiffdither = $portVersion compat >= 3
+		cmd:tiffdump = $portVersion compat >= 3
+		cmd:tiffinfo = $portVersion compat >= 3
+		cmd:tiffmedian = $portVersion compat >= 3
+		cmd:tiffset = $portVersion compat >= 3
+		cmd:tiffsplit = $portVersion compat >= 3
+		"
+	REQUIRES_tools="
+		haiku
+		lib:libjpeg
+		lib:libz
+		tiff == $portVersion base
+		"
+fi
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libjpeg$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -77,52 +119,3 @@ INSTALL()
 		rm -rf $documentationDir
 	fi
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 3
-	devel:libtiff$secondaryArchSuffix = $portVersion compat >= 3
-	devel:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	tiff$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- tools package -------------------------------------------------------
-
-if [ -z "$secondaryArchSuffix" ]; then
-	SUMMARY_tools="The TIFF tools"
-	PROVIDES_tools="
-		tiff_tools = $portVersion compat >= 3
-		cmd:bmp2tiff = $portVersion compat >= 3
-		cmd:fax2ps = $portVersion compat >= 3
-		cmd:fax2tiff = $portVersion compat >= 3
-		cmd:gif2tiff = $portVersion compat >= 3
-		cmd:pal2rgb = $portVersion compat >= 3
-		cmd:ppm2tiff = $portVersion compat >= 3
-		cmd:ras2tiff = $portVersion compat >= 3
-		cmd:raw2tiff = $portVersion compat >= 3
-		cmd:rgb2ycbcr = $portVersion compat >= 3
-		cmd:thumbnail = $portVersion compat >= 3
-		cmd:tiff2bw = $portVersion compat >= 3
-		cmd:tiff2pdf = $portVersion compat >= 3
-		cmd:tiff2ps = $portVersion compat >= 3
-		cmd:tiff2rgba = $portVersion compat >= 3
-		cmd:tiffcmp = $portVersion compat >= 3
-		cmd:tiffcp = $portVersion compat >= 3
-		cmd:tiffcrop = $portVersion compat >= 3
-		cmd:tiffdither = $portVersion compat >= 3
-		cmd:tiffdump = $portVersion compat >= 3
-		cmd:tiffinfo = $portVersion compat >= 3
-		cmd:tiffmedian = $portVersion compat >= 3
-		cmd:tiffset = $portVersion compat >= 3
-		cmd:tiffsplit = $portVersion compat >= 3
-		"
-	REQUIRES_tools="
-		haiku
-		lib:libjpeg
-		lib:libz
-		tiff == $portVersion base
-		"
-fi
diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe
index 964888afa..71e07f300 100644
--- a/media-libs/x264/x264-20140308.recipe
+++ b/media-libs/x264/x264-20140308.recipe
@@ -1,20 +1,17 @@
-SUMMARY="x264 h.264/AVC encoder"
-DESCRIPTION="
-x264 is a h.264/AVC encoder library.
-"
+SUMMARY="An encoder for x264 h.264/AVC"
+DESCRIPTION="x264 is a h.264/AVC encoder library."
 HOMEPAGE="http://www.videolan.org/developers/x264.html"
-COPYRIGHT="
-	2003-2012 http://www.videolan.org/developers/x264.html
-	"
+COPYRIGHT="	2003-2012 VideoLan.org"
 LICENSE="GNU GPL v2"
-SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2"
-CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe"
 REVISION="1"
+SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2"
+SOURCE_DIR="x264-snapshot-20140308-2245"
+CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe"
+PATCHES="x264-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="x264-$portVersion.patchset"
-
 PROVIDES="
 	x264$secondaryArchSuffix = $portVersion compat >= 20140308
 	cmd:x264$secondaryArchSuffix
@@ -23,6 +20,15 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308
+	devel:libx264$secondaryArchSuffix = 142 compat >= 142
+	"
+REQUIRES_devel="
+	x264$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -37,8 +43,6 @@ BUILD_PREREQUIRES="
 	cmd:yasm >= 1.2.0
 	"
 
-SOURCE_DIR="x264-snapshot-20140308-2245"
-
 BUILD()
 {
 	CFLAGS="-fPIC" runConfigure --omit-dirs \
@@ -59,13 +63,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308
-	devel:libx264$secondaryArchSuffix = 142 compat >= 142
-	"
-REQUIRES_devel="
-	x264$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.3.13.recipe
index 7746d1c8a..a6e1f726e 100644
--- a/media-sound/twolame/twolame-0.3.13.recipe
+++ b/media-sound/twolame/twolame-0.3.13.recipe
@@ -1,43 +1,47 @@
-SUMMARY="TwoLAME MPEG Audio Layer 2 encoder"
-DESCRIPTION="
-	TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME \
-	by Mike Cheng, which in turn is based upon the ISO dist10 code and \
-	portions of LAME.
-"
+SUMMARY="A MPEG Audio Layer 2 encoder"
+DESCRIPTION="TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based \
+on tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and \
+portions of LAME."
 HOMEPAGE="http://www.twolame.org"
-SOURCE_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz"
-LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2004-2006 The TwoLAME Project"
-CHECKSUM_SHA256="98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a"
+LICENSE="GNU LGPL v2.1"
 REVISION="2"
+CHECKSUM_SHA256="98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a"
+SOURCE_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz"
+PATCHES="twolame-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="twolame-$portVersion.patchset"
-
 PROVIDES="
 	twolame$secondaryArchSuffix = $portVersion compat >= 0
 	cmd:twolame$secondaryArchSuffix
 	lib:libtwolame$secondaryArchSuffix = 0.0.0 compat >= 0
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
-"
+	"
+
+PROVIDES_devel="
+	twolame${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libtwolame$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES_devel="
+	twolame$secondaryArchSuffix == $portVersion base
+	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libsndfile$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
-"
-
+	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
@@ -47,7 +51,7 @@ BUILD_PREREQUIRES="
 	cmd:autoheader
 	cmd:automake
 	cmd:make
-"
+	"
 
 BUILD()
 {
@@ -69,12 +73,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	twolame${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libtwolame$secondaryArchSuffix = $portVersion compat >= 0
-"
-
-REQUIRES_devel="
-	twolame$secondaryArchSuffix == $portVersion base
-"
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
index 89012f688..a2ab72adf 100644
--- a/net-p2p/transmission/transmission-2.82.recipe
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Transmission is a cross-platform open source BitTorrent client"
+SUMMARY="A cross-platform open source BitTorrent client"
 DESCRIPTION="Transmission is an open source, volunteer-based project. Unlike \
 some BitTorrent clients, Transmission doesn't play games with its users to \
 make money:
diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe
index 82c1455cb..9134f4d46 100644
--- a/net-p2p/transmission/transmission-2.84.recipe
+++ b/net-p2p/transmission/transmission-2.84.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Transmission is a cross-platform open source BitTorrent client"
+SUMMARY="A cross-platform open source BitTorrent client"
 DESCRIPTION="Transmission has the features you want from a BitTorrent client: \
 encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and \
 NAT-PMP port forwarding, webseed support, watch directories, tracker editing, \
diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe
index e40f382a6..1c589ef53 100644
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -1,17 +1,18 @@
-SUMMARY="xtrans"
-DESCRIPTION="
-xtrans.
-"
+SUMMARY="X.Org's library to handle network protocol transport"
+DESCRIPTION="xtrans is a library of code that is shared among various X \
+packages to handle network protocol transport in a modular fashion, allowing \
+a single place to add new transport types.  It is used by the X server, \
+libX11, libICE, the X font server, and related components."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
-CHECKSUM_SHA256="97d76ab76c755fabf2ef1896aaa76c0e38fc58d92799f9b2dd885a535cdd1e2b"
-REVISION="1"
 COPYRIGHT="1993, 1994, 1998  The Open Group
 	1993, 1994 NCR Corporation
 	2002, 2005 Sun Microsystems, Inc.
 	1996 Sebastien Marineau, Holger Veit
 	2003 Keith Packard, Noah Levitt"
 LICENSE="MIT (no promotion)"
+REVISION="1"
+SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
+CHECKSUM_SHA256="97d76ab76c755fabf2ef1896aaa76c0e38fc58d92799f9b2dd885a535cdd1e2b"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -25,10 +26,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe
index b6fba1b5d..c7ce7ac66 100644
--- a/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -1,21 +1,30 @@
-SUMMARY="xextproto"
-DESCRIPTION="
-xextproto.
-"
+SUMMARY="X.Org's generic event extension"
+DESCRIPTION="X was designed to provide 64 event opcodes for all extensions. \
+These events are limited to 32 bytes.
+
+The Generic Event Extension (xextproto) provides a template event for \
+extensions to re-use a single event opcode. GE only provide headers and the \
+most basic functionality, leaving the extensions to interpret the events in \
+their specific context.
+
+GenericEvents may be longer than 32 bytes. If so, the number of 4 byte units \
+following the initial 32 bytes must be specified in the length field of the \
+event."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz"
-CHECKSUM_SHA256="5ade284271eed437b05829be336b2b0ddaabad48335be220c0d9d5101fd8baec"
-REVISION="1"
 COPYRIGHT="1989, 1998  The Open Group
 	1997 by Silicon Graphics Computer Systems, Inc.
 	1992 Network Computing Devices
 	1994, 1995  Hewlett-Packard Company
 	1996 Digital Equipment Corporation, Maynard, Massachusetts.
 	1988, 1989, 1990, 1994 Network Computing Devices, Inc.
-	1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and Olivetti Research Limited, Cambridge, England.
+	1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and \
+Olivetti Research Limited, Cambridge, England.
 	1986, 1987, 1988 by Hewlett-Packard Corporation
 	2007-2008 Peter Hutterer"
 LICENSE="MIT (no promotion)"
+REVISION="1"
+SOURCE_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz"
+CHECKSUM_SHA256="5ade284271eed437b05829be336b2b0ddaabad48335be220c0d9d5101fd8baec"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -29,10 +38,9 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	"
-
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix >= 1.7.0
 	cmd:autoconf
 	cmd:libtool