De-lint recipes

* libmikmod Re-ordered blocks * libmodplug Don't start SUMMARY with app name Re-ordered blocks * librecad Don't start SUMMARY with app name Re-ordered blocks * libsvgtiny Don't start SUMMARY with app name Re-ordered blocks * libwalter Don't start SUMMARY with app name Re-ordered blocks * libwapcaplet Don't start SUMMARY with app name Re-ordered blocks * libxau Improved SUMMARY and DESCRIPTION Re-ordered blocks * links Improved SUMMARY and DESCRIPTION Re-ordered blocks * lynx Don't start SUMMARY with app name Re-ordered blocks
2026-04-09 05:10:05 +02:00 · 2015-08-07 17:16:19 +02:00
parent 9b24f53d44
commit 36e5637b9f
14 changed files with 206 additions and 251 deletions
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
@@ -1,15 +1,14 @@
-SUMMARY="LibWapcaplet is a string internment library"
-DESCRIPTION="
-LibWapcaplet is a string internment library.
+SUMMARY="A string internment library"
+DESCRIPTION="LibWapcaplet is a string internment library.
 It provides reference counted string interment and rapid string comparison \
-functionality.
-"
+functionality."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+COPYRIGHT="2009-2014 The NetSurf Browser project"
+LICENSE="MIT"
+REVISION="2"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.1-src.tar.gz"
 CHECKSUM_SHA256="9e4a8df3dfe6d7e1bcc4a3ccce18c3d02230545f4726b05b09b9e504946c8ec8"
-REVISION="2"
-LICENSE="MIT"
-COPYRIGHT="2009-2014 The NetSurf Browser project"
+PATCHES="libwapcaplet-0.2.1.patchset"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -18,19 +17,24 @@ PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
 	lib:libwapcaplet$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"

+REQUIRES_devel="
+	libwapcaplet$secondaryArchSuffix == $portVersion base
+	"
+PROVIDES_devel="
+	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
-
 	lib:libcheck
 	devel:libcheck
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -38,7 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-PATCHES="libwapcaplet-0.2.1.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -59,8 +62,3 @@ TEST()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
-
-PROVIDES_devel="
-	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
-	devel:libwapcaplet$secondaryArchSuffix = $portVersion
-"
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.2.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.2.recipe
@@ -1,16 +1,14 @@
-SUMMARY="LibWapcaplet is a string internment library"
-DESCRIPTION="
-LibWapcaplet is a string internment library.
+SUMMARY="A string internment library"
+DESCRIPTION="LibWapcaplet is a string internment library.
 It provides reference counted string interment and rapid string comparison \
-functionality.
-"
+functionality."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+COPYRIGHT="2009-2014 The NetSurf Browser project"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-${portVersion}-src.tar.gz"
 CHECKSUM_SHA256="38021992e1e6b3ec50d0d3bf7add069bee4c5b179691afa6a76dd58695201485"
-REVISION="1"
 PATCHES="libwapcaplet-0.2.1.patchset"
-LICENSE="MIT"
-COPYRIGHT="2009-2014 The NetSurf Browser project"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -19,19 +17,24 @@ PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
 	lib:libwapcaplet$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"

+REQUIRES_devel="
+	libwapcaplet$secondaryArchSuffix == $portVersion base
+	"
+PROVIDES_devel="
+	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
-
 	lib:libcheck
 	devel:libcheck
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -59,8 +62,3 @@ TEST()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
-
-PROVIDES_devel="
-	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
-	devel:libwapcaplet$secondaryArchSuffix = $portVersion
-"
--- a/haiku-libs/libwalter/libwalter-97.recipe
+++ b/haiku-libs/libwalter/libwalter-97.recipe
@@ -1,11 +1,7 @@
-SUMMARY="LibWalter"
+SUMMARY="A collection of classes and controls"
 DESCRIPTION="LibWalter is a supplementary collection of class and controls not present in \
 the standard Haiku API."
 HOMEPAGE="https://github.com/HaikuArchives/LibWalter/"
-SOURCE_URI="https://github.com/HaikuArchives/LibWalter/archive/59fdad559ee3dbcc58675cb27502ececce795bbc.tar.gz"
-CHECKSUM_SHA256="f418e14a1f8e1aa803385dc17cd178d9e85e7efd3bc4386ec12416eeeb7a1fec"
-REVISION="1"
-LICENSE="MIT"
 COPYRIGHT="1991-2000, Be Incorporated. All rights reserved.
 	1998 dirk116
 	2001 Atsushi Takamatsu
@@ -14,6 +10,11 @@ COPYRIGHT="1991-2000, Be Incorporated. All rights reserved.
 	2007 Matthias Lindner
 	2007 Oliver Ruiz Dorantes
 	2007-2008 DarkWyrm"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/HaikuArchives/LibWalter/archive/59fdad559ee3dbcc58675cb27502ececce795bbc.tar.gz"
+CHECKSUM_SHA256="f418e14a1f8e1aa803385dc17cd178d9e85e7efd3bc4386ec12416eeeb7a1fec"
+SOURCE_DIR="LibWalter-59fdad559ee3dbcc58675cb27502ececce795bbc"

 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -25,17 +26,17 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+	
 BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
 	cmd:jam
 	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	"
-SOURCE_DIR="LibWalter-59fdad559ee3dbcc58675cb27502ececce795bbc"

 BUILD()
 {
@@ -43,6 +44,14 @@ BUILD()
 	jam
 }

+INSTALL()
+{
+	mkdir -p $libDir
+	mkdir -p $includeDir/libwalter
+	cp libwalter.a $libDir/libwalter.a
+	cp -a include/. $includeDir/libwalter
+}
+
 TEST()
 {
 	cd tests
@@ -57,11 +66,3 @@ TEST()
 	SplitPanelTest
 	ToolbarTest
 }
-
-INSTALL()
-{
-	mkdir -p $libDir
-	mkdir -p $includeDir/libwalter
-	cp libwalter.a $libDir/libwalter.a
-	cp -a include/. $includeDir/libwalter
-}
--- a/media-gfx/librecad/librecad-2.0.7.recipe
+++ b/media-gfx/librecad/librecad-2.0.7.recipe
@@ -1,14 +1,15 @@
-SUMMARY="LibreCAD is a 2D CAD drawing tool"
+SUMMARY="A 2D CAD drawing tool"
 DESCRIPTION="LibreCAD is a 2D CAD drawing tool based on the community edition \
 of QCAD (http://www.qcad.org).

 LibreCAD has been re-structured, ported to new Qt versions and works natively \
 cross platform between OS X, Windows, Linux and Haiku."
 HOMEPAGE="http://librecad.org"
-SOURCE_URI="git+https://github.com/LibreCAD/LibreCAD#fc30396"
-REVISION="1"
-LICENSE="GNU GPL v2"
 COPYRIGHT="2015 LibreCAD"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="git+https://github.com/LibreCAD/LibreCAD#fc30396"
+PATCHES="librecad_x86-2.0.7.patchset"

 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -18,7 +19,6 @@ PROVIDES="
 	app:LibreCAD$secondaryArchSuffix = $portVersion
 	cmd:ttf2lff$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	libqt4$secondaryArchSuffix >= 4.8.0
@@ -26,21 +26,18 @@ REQUIRES="
 	"

 BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	cmd:qmake$secondaryArchSuffix
 	cmd:make
 	cmd:g++$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
 	boost${secondaryArchSuffix}_devel
 	devel:libfreetype$secondaryArchSuffix
 	"

-PATCHES="librecad_x86-2.0.7.patchset"
-
 BUILD()
 {
 	qmake
--- a/media-libs/libmikmod/libmikmod-3.1.14.recipe
+++ b/media-libs/libmikmod/libmikmod-3.1.14.recipe
@@ -1,13 +1,13 @@
-SUMMARY="libmikmod is a lib for playing mod files"
-DESCRIPTION="
-libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
-"
+SUMMARY="A library for playing MOD files"
+DESCRIPTION="libmikmod is a library supporting many formats, including mod, \
+s3m, it, and xm."
 HOMEPAGE="http://mikmod.sourceforge.net"
+COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, \
+Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.1.14/libmikmod-3.1.14.tar.gz"
 CHECKSUM_SHA256="fd78b67a74c802fee9040cd1f53d629beb985933585dd7d2f3bc69b069b321cd"
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
-REVISION="1"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

@@ -15,18 +15,25 @@ PROVIDES="
 	libmikmod = $portVersion compat >= 3.1
 	lib:libmikmod = 2.0.5 compat >= 2
 	"
-
 REQUIRES="
 	haiku
 	"

-BUILD_REQUIRES="
+PROVIDES_devel="
+	libmikmod_devel = $portVersion
+	cmd:libmikmod_config
+	devel:libmikmod = 2.0.5 compat >= 0
+	"
+REQUIRES_devel="
+	libmikmod == $portVersion base
 	"

-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
@@ -56,15 +63,3 @@ INSTALL()
 		$developDir $binDir/libmikmod-config \
 		$dataDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmikmod_devel = $portVersion
-	cmd:libmikmod_config
-	devel:libmikmod = 2.0.5 compat >= 0
-	"
-
-REQUIRES_devel="
-	libmikmod == $portVersion base
-	"
--- a/media-libs/libmikmod/libmikmod-3.3.7.recipe
+++ b/media-libs/libmikmod/libmikmod-3.3.7.recipe
@@ -1,13 +1,14 @@
-SUMMARY="A lib for playing mod files"
-DESCRIPTION="
-libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
-"
+SUMMARY="A library for playing MOD files"
+DESCRIPTION="libmikmod is a library supporting many formats, including mod, \
+s3m, it, and xm."
 HOMEPAGE="http://mikmod.sourceforge.net"
+COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve \
+McIntyre, Peter Amstutz, and Miodrag Vallat."
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/$portVersion/libmikmod-$portVersion.tar.gz"
 CHECKSUM_SHA256="4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2"
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
-REVISION="1"
+PATCHES="libmikmod-$portVersion.patchset"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -16,19 +17,26 @@ PROVIDES="
 	libmikmod$secondaryArchSuffix = $portVersion compat >= 3.3
 	lib:libmikmod$secondaryArchSuffix = 3.3.0 compat >= 3
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libsdl$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	"

-BUILD_REQUIRES="
-	devel:libsdl$secondaryArchSuffix
+PROVIDES_devel="
+	libmikmod${secondaryArchSuffix}_devel = $portVersion
+	cmd:libmikmod_config$secondaryArchSuffix
+	devel:libmikmod$secondaryArchSuffix = 3.3.0 compat >= 3
+	"
+REQUIRES_devel="
+	libmikmod$secondaryArchSuffix == $portVersion base
 	"

-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libsdl$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:aclocal
@@ -37,8 +45,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

-PATCHES="libmikmod-$portVersion.patchset"
-
 BUILD()
 {
 	autoreconf -fi
@@ -59,15 +65,3 @@ INSTALL()
 		$developDir $binDir/libmikmod-config \
 		$dataDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmikmod${secondaryArchSuffix}_devel = $portVersion
-	cmd:libmikmod_config$secondaryArchSuffix
-	devel:libmikmod$secondaryArchSuffix = 3.3.0 compat >= 3
-	"
-
-REQUIRES_devel="
-	libmikmod$secondaryArchSuffix == $portVersion base
-	"
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe
@@ -1,17 +1,16 @@
-SUMMARY="libmodplug is a lib for playing mod files"
-DESCRIPTION="
-Olivier Lapicque, author of Modplug, which is arguably the best quality \
-MOD-playing software available, has placed his sound rendering code in the \
-public domain. This library and plugin is based on that code.
-Plays 22 different mod formats, zip, rar, gzip, and bzip2 compressed mods.
-"
+SUMMARY="A library for playing MOD files"
+DESCRIPTION="Olivier Lapicque, author of Modplug, which is arguably the best \
+quality MOD-playing software available, has placed his sound rendering code \
+in the public domain. This library and plugin is based on that code.
+Plays 22 different mod formats, zip, rar, gzip, and bzip2 compressed mods."
 HOMEPAGE="http://modplug-xmms.sourceforge.net"
+COPYRIGHT="Public Domain"
+LICENSE="Public Domain"
+REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/$portVersion/libmodplug-$portVersion.tar.gz"
 CHECKSUM_SHA256="77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad"
 PATCHES="libmodplug-$portVersion.patchset"
-LICENSE="Public Domain"
-COPYRIGHT="Public Domain"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

@@ -23,10 +22,18 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"

+PROVIDES_devel="
+	libmodplug${secondaryArchSuffix}_devel = $portVersion
+	devel:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	libmodplug$secondaryArchSuffix == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -64,13 +71,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libmodplug${secondaryArchSuffix}_devel = $portVersion
-	devel:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1
-	"
-REQUIRES_devel="
-	libmodplug$secondaryArchSuffix == $portVersion
-	"
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
@@ -1,37 +1,44 @@
-SUMMARY="Libsvgtiny is an implementation of SVG Tiny written in C"
-DESCRIPTION="
-The overall idea of the library is to take some SVG as input, and return a \
-list of paths and texts which can be rendered easily. The library does not do \
-the actual rendering.
-"
+SUMMARY="An implementation of SVG Tiny written in C"
+DESCRIPTION="The overall idea of the library is to take some SVG as input, \
+and return a list of paths and texts which can be rendered easily. The \
+library does not do the actual rendering."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
 COPYRIGHT="2003-2014 The NetSurf Developers"
 LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="0835de639ae0266c394824fa78dc210013c5eeddef222d8b6485edb7fe0ddcd6"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libsvgtiny-$portVersion.patchset"

+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libsvgtiny = $portVersion
 	"
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	libsvgtiny_devel = $portVersion
+	devel:libsvgtiny = $portVersion
+	"
+REQUIRES_devel="
+	libsvgtiny$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libwapcaplet
 	devel:libdom
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:gperf
 	cmd:make
 	cmd:pkg_config
-"
+	"

 BUILD()
 {
@@ -51,13 +58,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsvgtiny_devel = $portVersion
-	devel:libsvgtiny = $portVersion
-	"
-REQUIRES_devel="
-	libsvgtiny$secondaryArchSuffix == $portVersion base
-	"
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe
@@ -1,39 +1,46 @@
-SUMMARY="Libsvgtiny is an implementation of SVG Tiny written in C"
-DESCRIPTION="
-The overall idea of the library is to take some SVG as input, and return a \
-list of paths and texts which can be rendered easily. The library does not do \
-the actual rendering.
-"
+SUMMARY="An implementation of SVG Tiny written in C"
+DESCRIPTION="The overall idea of the library is to take some SVG as input, \
+and return a list of paths and texts which can be rendered easily. The \
+library does not do the actual rendering."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
 COPYRIGHT="2003-2014 The NetSurf Developers"
 LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="a5ad4ba467e2ba10ac13fb881937655c5d0ef8e9582ede6a2c73447c87d06e90"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
 PATCHES="libsvgtiny-0.1.1.patchset"

+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libsvgtiny = $portVersion
-"
+	"
 REQUIRES="
 	haiku
-"
+	"
+
+PROVIDES_devel="
+	libsvgtiny_devel = $portVersion
+	devel:libsvgtiny = $portVersion
+	"
+REQUIRES_devel="
+	libsvgtiny$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libwapcaplet
 	devel:libdom
 	devel:libhubbub
 	devel:libparserutils
-"
+	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:gperf
 	cmd:make
 	cmd:pkg_config
-"
+	"

 BUILD()
 {
@@ -52,13 +59,3 @@ INSTALL()
 	# devel package
 	packageEntries devel $developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsvgtiny_devel = $portVersion
-	devel:libsvgtiny = $portVersion
-"
-REQUIRES_devel="
-	libsvgtiny$secondaryArchSuffix == $portVersion base
-"
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.3.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.3.recipe
@@ -1,39 +1,46 @@
-SUMMARY="Libsvgtiny is an implementation of SVG Tiny written in C"
-DESCRIPTION="
-The overall idea of the library is to take some SVG as input, and return a \
-list of paths and texts which can be rendered easily. The library does not do \
-the actual rendering.
-"
+SUMMARY="An implementation of SVG Tiny written in C"
+DESCRIPTION="The overall idea of the library is to take some SVG as input, \
+and return a list of paths and texts which can be rendered easily. The \
+library does not do the actual rendering."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
 COPYRIGHT="2003-2014 The NetSurf Developers"
 LICENSE="MIT"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
-#CHECKSUM_SHA256="a5ad4ba467e2ba10ac13fb881937655c5d0ef8e9582ede6a2c73447c87d06e90"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
+SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
+CHECKSUM_SHA256="cbdc024743a56ccacbfa6d6bbce135ab6d701d38609f4a1ac56c2842457e5dff"
 PATCHES="libsvgtiny-0.1.1.patchset"

+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	libsvgtiny = $portVersion
-"
+	"
 REQUIRES="
 	haiku
-"
+	"
+
+PROVIDES_devel="
+	libsvgtiny_devel = $portVersion
+	devel:libsvgtiny = $portVersion
+	"
+REQUIRES_devel="
+	libsvgtiny$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libwapcaplet
 	devel:libdom
 	devel:libhubbub
 	devel:libparserutils
-"
+	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	netsurf_buildsystem
 	cmd:gcc
 	cmd:gperf
 	cmd:make
 	cmd:pkg_config
-"
+	"

 BUILD()
 {
@@ -52,13 +59,3 @@ INSTALL()
 	# devel package
 	packageEntries devel $developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libsvgtiny_devel = $portVersion
-	devel:libsvgtiny = $portVersion
-"
-REQUIRES_devel="
-	libsvgtiny$secondaryArchSuffix == $portVersion base
-"
--- a/www-client/links/links-2.3pre2.recipe
+++ b/www-client/links/links-2.3pre2.recipe
@@ -1,14 +1,13 @@
-SUMMARY="links web browser"
-DESCRIPTION="
-links web browser.
-"
+SUMMARY="A graphics and text mode web browser"
+DESCRIPTION="Links is a multi-platform web browser you can run in Terminal."
 HOMEPAGE="http://links.twibright.com/"
-SOURCE_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz"
-CHECKSUM_SHA256="a9c6b8d9e783dc0caaa32f5acf1e3163a5d41b2ba395c93af8587b325b51bac0"
-REVISION="1"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1999 - 2011 Mikulas Patocka
 	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz"
+CHECKSUM_SHA256="a9c6b8d9e783dc0caaa32f5acf1e3163a5d41b2ba395c93af8587b325b51bac0"
+PATCHES="links-2.3pre2.patch"

 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
@@ -27,6 +26,7 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 #	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
@@ -35,9 +35,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	openssl_devel >= 1.0.0
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
@@ -47,8 +45,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-PATCHES="links-2.3pre2.patch"
-
 BUILD()
 {
 	autoconf
--- a/www-client/links/links-2.8.recipe
+++ b/www-client/links/links-2.8.recipe
@@ -1,15 +1,13 @@
-SUMMARY="links web browser"
-DESCRIPTION="
-links web browser.
-"
+SUMMARY="A graphics and text mode web browser"
+DESCRIPTION="Links is a multi-platform web browser you can run in Terminal."
 HOMEPAGE="http://links.twibright.com/"
-SOURCE_URI="http://links.twibright.com/download/links-2.8.tar.gz"
-CHECKSUM_SHA256="5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a"
-REVISION="1"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1999 - 2011 Mikulas Patocka
 	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
-
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://links.twibright.com/download/links-2.8.tar.gz"
+CHECKSUM_SHA256="5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a"
+PATCHES="links-2.8.patch"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -28,6 +26,7 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 #	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
@@ -36,9 +35,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	openssl${secondaryArchSuffix}_devel >= 1.0.0
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
@@ -48,8 +45,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-PATCHES="links-2.8.patch"
-
 BUILD()
 {
 	aclocal
--- a/www-client/lynx/lynx-2.8.9dev.1.recipe
+++ b/www-client/lynx/lynx-2.8.9dev.1.recipe
@@ -1,15 +1,14 @@
-SUMMARY="Lynx web browser"
-DESCRIPTION="
-An excellent console-based web browser with ssl support.
-"
+SUMMARY="A text-mode web browser"
+DESCRIPTION="An excellent console-based web browser with SSL support."
 HOMEPAGE="http://lynx.isc.org/"
-SOURCE_URI="http://lynx.isc.org/current/lynx2.8.9dev.1.tar.bz2"
-CHECKSUM_SHA256="e9278002e34175240e986db92a60f6214f35999f51287056149cdc08578c2bff"
-REVISION="1"
+COPYRIGHT="1997-2013, 2014 Thomas E. Dickey"
 #XXX:Also check COPYHEADER?
 LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2013,2014 Thomas E. Dickey"
-
+REVISION="1"
+SOURCE_URI="http://lynx.isc.org/current/lynx2.8.9dev.1.tar.bz2"
+CHECKSUM_SHA256="e9278002e34175240e986db92a60f6214f35999f51287056149cdc08578c2bff"
+SOURCE_DIR="lynx2-8-9"
+PATCHES="lynx-2.8.9dev.1.patchset"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -27,14 +26,13 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix >= 1.2.8
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	#cmd:autoconf
 	cmd:ar
 	cmd:bison
@@ -48,10 +46,6 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	"

-SOURCE_DIR="lynx2-8-9"
-
-PATCHES="lynx-2.8.9dev.1.patchset"
-
 GLOBAL_WRITABLE_FILES="
 	settings/lynx.lss keep-old
 	settings/lynx.cfg keep-old
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
@@ -1,13 +1,17 @@
-SUMMARY="libxau"
-DESCRIPTION="
-libxau.
-"
+SUMMARY="X.Org's sample authorization protocol for X"
+DESCRIPTION="This example describes a very simple mechanism for providing \
+individual access to an X Window System display.  It uses existing core \
+protocol and library hooks for specifying authorization data in the \
+connection setup block to restrict use of the display to only those clients \
+that show that they know a server-specific key called a 'magic cookie'."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
-CHECKSUM_SHA256="2ad4324cf204331d6773bba441baed58e46168e7913de2079f10b272eae5c4db"
-REVISION="1"
 COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
 LICENSE="MIT (no promotion)"
+REVISION="1"
+SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
+CHECKSUM_SHA256="2ad4324cf204331d6773bba441baed58e46168e7913de2079f10b272eae5c4db"
+SOURCE_DIR="libXau-$portVersion"
+PATCHES="libxau-1.0.5.patch"

 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -27,7 +31,6 @@ BUILD_REQUIRES="
 	haiku$secondaryArchSuffix
 	devel:xproto$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:util_macros$secondaryArchSuffix
@@ -40,10 +43,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-SOURCE_DIR="libXau-$portVersion"
-
-PATCHES="libxau-1.0.5.patch"
-
 BUILD()
 {
 	libtoolize --force --copy --install