From 9e304a2e9a7fd21323c7ff96dc11dead7de5eb13 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 23 Jul 2015 13:23:17 +0200
Subject: [PATCH] De-lint recipes.

*	v8
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	verilator
	80-char limit of DESCRIPTION.
	Re-ordered blocks.

*	vim
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	virtulbelive
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	vl_gothic
	Shortened SUMMARY.
	Re-ordered blocks.

*	vlc
	Re-ordered blocks.
	Changed libgpg-error to libgpg_error.

*	vncserver
	Improved COPYRIGHT.
	Re-ordered blocks.

*	vwget
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	wesnoth
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	xerces
	Removed "." from SUMMARY.
	Re-ordered blocks.

*	zip
	Re-ordered blocks.
	Lint warning of non-declared patch can be ignored, as it doesn't
	grok: $portName-$portVersion.patchset
---
 app-arch/zip/zip-3.0.recipe                   | 21 ++++----
 app-editors/vim/vim-7.3.recipe                | 37 +++++++------
 app-editors/vim/vim-7.4.recipe                | 28 +++++-----
 dev-lang/v8/v8-3.16.1.recipe                  | 54 +++++++++----------
 dev-libs/xerces_c/xerces_c-3.1.2.recipe       | 37 ++++++-------
 games-strategy/wesnoth/wesnoth-1.12.2.recipe  | 26 ++++-----
 .../virtualbelive-20140718.recipe             | 22 ++++----
 haiku-apps/vncserver/vncserver-1.26.recipe    | 24 +++++----
 haiku-apps/vwget/vwget-20141229.recipe        |  9 ++--
 .../vl_gothic/vl_gothic-20140530.recipe       | 42 ++++++++-------
 .../vl_gothic/vl_gothic-20141206.recipe       | 41 +++++++-------
 media-video/vlc/vlc-0.8.6i.recipe             | 28 +++++-----
 media-video/vlc/vlc-2.2.1.recipe              | 36 ++++++-------
 .../verilator/verilator-3.864.recipe          | 25 +++++----
 14 files changed, 206 insertions(+), 224 deletions(-)

diff --git a/app-arch/zip/zip-3.0.recipe b/app-arch/zip/zip-3.0.recipe
index dd0575385..b7c8dc44d 100644
--- a/app-arch/zip/zip-3.0.recipe
+++ b/app-arch/zip/zip-3.0.recipe
@@ -1,20 +1,18 @@
 SUMMARY="Compression utility for zip archives"
-DESCRIPTION="
-Zip is a compression and packaging utility with high \
+DESCRIPTION="Zip is a compression and packaging utility with high \
 portability. It supports password-based encryption of files and filenames, \
-incremental backups and multi-part archives.
-"
+incremental backups and multi-part archives."
 HOMEPAGE="http://www.info-zip.org/Zip.html"
+COPYRIGHT="1990-2008 Info-ZIP"
+LICENSE="Info-ZIP"
+REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"
 CHECKSUM_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
-REVISION="2"
-LICENSE="Info-ZIP"
-COPYRIGHT="1990-2008 Info-ZIP"
+SOURCE_DIR="zip30"
+PATCHES="$portName-$portVersion.patchset"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
-PATCHES="$portName-$portVersion.patchset"
-
 PROVIDES="
 	$portName = $portVersion
 	cmd:zip = $portVersion
@@ -26,17 +24,16 @@ REQUIRES="
 	haiku
 	lib:libz
 	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	"
-	
-SOURCE_DIR="zip30"
 
 BUILD()
 {
diff --git a/app-editors/vim/vim-7.3.recipe b/app-editors/vim/vim-7.3.recipe
index f7146be25..f607b07fb 100644
--- a/app-editors/vim/vim-7.3.recipe
+++ b/app-editors/vim/vim-7.3.recipe
@@ -1,21 +1,23 @@
-SUMMARY="Vim is highly configurable text editor."
-DESCRIPTION="
-Vim is a highly configurable text editor built to enable efficient text \
-editing. It is an improved version of the vi editor distributed with most UNIX \
-systems.
+SUMMARY="A highly configurable text editor"
+DESCRIPTION="Vim is a highly configurable text editor built to enable \
+efficient text editing. It is an improved version of the vi editor \
+distributed with most UNIX systems.
+
 Vim is often called a \"programmer's editor,\" and so useful for programming \
 that many consider it an entire IDE. It's not just for programmers, though. \
 Vim is perfect for all kinds of text editing, from composing email to editing \
 configuration files.
-Despite this, Vim can be configured to work in a very \
-simple (Notepad-like) way, called evim or Easy Vim.
-"
+Despite this, Vim can be configured to work in a very simple (Notepad-like) \
+way, called evim or Easy Vim."
 HOMEPAGE="http://www.vim.org"
-SOURCE_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2"
-CHECKSUM_SHA256="5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="1"
+SOURCE_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2"
+CHECKSUM_SHA256="5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d"
+SOURCE_DIR="vim73"
+PATCHES="vim-7.3.patchset"
+
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -33,24 +35,21 @@ PROVIDES="
 	cmd:vimtutor = $portVersion
 	cmd:view = $portVersion
 	cmd:xxd = $portVersion
-"
+	"
 REQUIRES="
 	haiku
 	lib:libncurses
-"
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	ncurses_devel
-"
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:autoconf
 	cmd:gcc
-"
-
-SOURCE_DIR="vim73"
-PATCHES="
-	vim-7.3.patchset
-"
+	"
 
 BUILD()
 {
diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe
index 69575926c..113438a85 100644
--- a/app-editors/vim/vim-7.4.recipe
+++ b/app-editors/vim/vim-7.4.recipe
@@ -1,21 +1,23 @@
 SUMMARY="A highly configurable text editor"
-DESCRIPTION="
-Vim is a highly configurable text editor built to enable efficient text \
-editing. It is an improved version of the vi editor distributed with most UNIX \
-systems.
+DESCRIPTION="Vim is a highly configurable text editor built to enable \
+efficient text editing. It is an improved version of the vi editor \
+distributed with most UNIX systems.
+
 Vim is often called a \"programmer's editor,\" and so useful for programming \
 that many consider it an entire IDE. It's not just for programmers, though. \
 Vim is perfect for all kinds of text editing, from composing email to editing \
 configuration files.
-Despite this, Vim can be configured to work in a very \
-simple (Notepad-like) way, called evim or Easy Vim.
-"
+Despite this, Vim can be configured to work in a very simple (Notepad-like) \
+way, called evim or Easy Vim."
 HOMEPAGE="http://www.vim.org"
-SOURCE_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
-CHECKSUM_SHA256="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="3"
+SOURCE_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
+CHECKSUM_SHA256="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade"
+SOURCE_DIR="vim74"
+PATCHES="vim-7.4.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -40,12 +42,13 @@ REQUIRES="
 	lib:libncurses
 	lib:libintl
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	ncurses_devel
 	gettext
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:make
 	cmd:autoconf
 	cmd:gcc
@@ -54,11 +57,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="vim74"
-PATCHES="
-	vim-7.4.patchset
-	"
-
 BUILD()
 {
 	cd src
diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe
index 2e6be5879..f1379c46b 100644
--- a/dev-lang/v8/v8-3.16.1.recipe
+++ b/dev-lang/v8/v8-3.16.1.recipe
@@ -1,18 +1,20 @@
-SUMMARY="Google's open source JavaScript engine."
-DESCRIPTION="
-V8 is Google's open source JavaScript engine. V8 is written in C++ and is used \
-in Google Chrome, the open source browser from Google. V8 implements \
-ECMAScript as specified in ECMA-262, 5th edition, and runs on Windows (XP or \
-newer), Mac OS X (10.5 or newer), and Linux systems that use IA-32, x64, or \
-ARM processors. V8 can run standalone, or can be embedded into any C++ \
-application.
-"
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2006-2012 The V8 Project Authors"
+SUMMARY="Google's open source JavaScript engine"
+DESCRIPTION="V8 is Google's open source JavaScript engine. V8 is written in \
+C++ and is used in Google Chrome, the open source browser from Google. V8 \
+implements ECMAScript as specified in ECMA-262, 5th edition, and runs on \
+Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems that use \
+IA-32, x64, or ARM processors. V8 can run standalone, or can be embedded into \
+any C++ application."
 HOMEPAGE="https://code.google.com/p/v8/" 
+COPYRIGHT="2006-2012 The V8 Project Authors"
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="git+https://github.com/hamishm/v8.git#5698a30"
 SOURCE_URI_2="svn+http://gyp.googlecode.com/svn/trunk#1773"
-REVISION="1"
+SOURCE_DIR="v8"
+SOURCE_DIR_2="gyp"
+PATCHES="v8-3.16.1.patch"
+
 ARCHITECTURES="?x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -36,15 +38,22 @@ PROVIDES="
 	cmd:d8$commandSuffix = $portVersion
 	lib:libv8$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES=""
+PROVIDES_devel="
+	v8${secondaryArchSuffix}_devel = $portVersion
+	devel:libv8$secondaryArchSuffix
+	"
+REQUIRES_devel="
+	v8$secondaryArchSuffix == $portVersion
+	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:python
@@ -53,27 +62,12 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	"
 
-PROVIDES_devel="
-	v8${secondaryArchSuffix}_devel = $portVersion
-	devel:libv8$secondaryArchSuffix
-	"
-
-REQUIRES_devel="
-	v8$secondaryArchSuffix == $portVersion
-	"
-
-PATCHES="v8-3.16.1.patch"
-
 PATCH()
 {
 	cd $sourceDir2
 	patch -p0 -i $(haikuporter -t)/dev-lang/v8/patches/gyp-r1773.patch
 }
 
-SOURCE_DIR="v8"
-
-SOURCE_DIR_2="gyp"
-
 BUILD()
 {
 	ln -sfn $sourceDir2 build/gyp
diff --git a/dev-libs/xerces_c/xerces_c-3.1.2.recipe b/dev-libs/xerces_c/xerces_c-3.1.2.recipe
index a5e2fe21a..9c72c8fa4 100644
--- a/dev-libs/xerces_c/xerces_c-3.1.2.recipe
+++ b/dev-libs/xerces_c/xerces_c-3.1.2.recipe
@@ -1,17 +1,16 @@
-SUMMARY="A validating XML parser written in a portable subset of C++."
+SUMMARY="A validating XML parser written in a portable subset of C++"
 DESCRIPTION="This library makes it easy to give your application the ability \
 to read and write XML data. A shared library is provided for parsing, \
 generating, manipulating, and validating XML documents using the DOM, SAX, \
-and SAX2 APIs.
-"
+and SAX2 APIs."
 HOMEPAGE="https://xerces.apache.org/xerces-c/"
-COPYRIGHT="
-	1999-2015 The Apache Software Foundation.
-"
+COPYRIGHT="1999-2015 The Apache Software Foundation"
 LICENSE="Apache v2"
+REVISION="1"
 SOURCE_URI="http://apache.mirrors.tds.net//xerces/c/3/sources/xerces-c-$portVersion.tar.gz"
 CHECKSUM_SHA256="743bd0a029bf8de56a587c270d97031e0099fe2b7142cef03e0da16e282655a0"
-REVISION="1"
+SOURCE_DIR="xerces-c-$portVersion"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -22,8 +21,6 @@ else
 fi
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
-SOURCE_DIR="xerces-c-$portVersion"
-
 PROVIDES="
 	xerces_c$secondaryArchSuffix = $portVersion compat >= 3.1
 	lib:libxerces_c_3.1$secondaryArchSuffix = 3.1
@@ -43,7 +40,6 @@ PROVIDES="
 	cmd:SEnumVal$secondaryArchSuffix
 	cmd:StdInParse$secondaryArchSuffix
 	cmd:XInclude$secondaryArchSuffix
-
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -54,6 +50,16 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 		lib:libgcc_s$secondaryArchSuffix
 		"
 fi
+
+PROVIDES_devel="
+	xerces_c${secondaryArchSuffix}_devel = $portVersion compat >= 3.1
+	devel:libxerces_c_3.1$secondaryArchSuffix = 3.1
+	devel:libxerces_c$secondaryArchSuffix = 3.1
+	"
+REQUIRES_devel="
+	xerces_c$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -85,14 +91,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	xerces_c${secondaryArchSuffix}_devel = $portVersion compat >= 3.1
-	devel:libxerces_c_3.1$secondaryArchSuffix = 3.1
-	devel:libxerces_c$secondaryArchSuffix = 3.1
-	"
-REQUIRES_devel="
-	xerces_c$secondaryArchSuffix == $portVersion base
-	"
diff --git a/games-strategy/wesnoth/wesnoth-1.12.2.recipe b/games-strategy/wesnoth/wesnoth-1.12.2.recipe
index 6b5055cf5..d0348ff58 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.2.recipe
+++ b/games-strategy/wesnoth/wesnoth-1.12.2.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Turn-based tactical strategy game with a high fantasy theme."
+SUMMARY="Turn-based tactical strategy game with a high fantasy theme"
 DESCRIPTION="Build up a great army, gradually turning raw recruits into \
 hardened veterans. In later games, recall your toughest warriors and form a \
 deadly host whom none can stand against! Choose units from a large pool of \
@@ -10,8 +10,8 @@ throne of Wesnoth, of which you are the legitimate heir... step into the \
 boots of a young officer sent to guard a not-so-sleepy frontier outpost... \
 lead a brutal quest to unite the orcish tribes... vanquish a horde of undead \
 warriors unleashed by a foul necromancer, who also happens to have taken your \
-brother hostage... guide a band of elvish survivors in an epic quest to find a \
-new home... get revenge on the orcs by using the foul art of necromancy...
+brother hostage... guide a band of elvish survivors in an epic quest to find \
+a new home... get revenge on the orcs by using the foul art of necromancy...
 
 There are at least two hundred unit types, sixteen races, six major factions, \
 and hundreds of years of history. The world of Wesnoth is absolutely huge and \
@@ -20,7 +20,11 @@ maps, and write your own scenarios or even full-blown campaigns. You can also \
 challenge up to eight friends—or strangers—and fight in epic multiplayer \
 fantasy battles."
 HOMEPAGE="http://wesnoth.org/"
+COPYRIGHT="2003-2015 The Battle for Wesnoth"
+LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="http://sourceforge.net/projects/wesnoth/files/wesnoth-1.12/wesnoth-$portVersion/wesnoth-$portVersion.tar.bz2"
+CHECKSUM_SHA256="1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b"
 
 ARCHITECTURES=""
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -30,15 +34,12 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2015 The Battle for Wesnoth"
-
-SOURCE_URI="http://sourceforge.net/projects/wesnoth/files/wesnoth-1.12/wesnoth-$portVersion/wesnoth-$portVersion.tar.bz2"
-CHECKSUM_SHA256="1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b"
-
 PROVIDES="
 	wesnoth$secondaryArchSuffix
-"
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -53,14 +54,13 @@ BUILD_REQUIRES="
 	devel:libvorbisfile$secondaryArchSuffix
 	devel:libboost_filesystem$secondaryArchSuffix
 	devel:libpangocairo_1.0$secondaryArchSuffix
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-"
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
index fbe76008a..0186f3b36 100644
--- a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
+++ b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
@@ -1,13 +1,11 @@
-SUMMARY="Video editing software."
-DESCRIPTION="
-VirtualBeLive is a software for video editing. It supports basic transitions, \
-cutting and a few effects.
-"
+SUMMARY="A basic video editing software"
+DESCRIPTION="VirtualBeLive is a software for video editing. It supports basic \
+transitions, cutting and a few effects."
 HOMEPAGE="https://github.com/HaikuArchives/VirtualBeLive"
-SOURCE_URI="git+https://github.com/HaikuArchives/VirtualBeLive#23bea51"
-REVISION="1"
-LICENSE="Public Domain"
 COPYRIGHT="Public Domain"
+LICENSE="Public Domain"
+REVISION="1"
+SOURCE_URI="git+https://github.com/HaikuArchives/VirtualBeLive#23bea51"
 
 ARCHITECTURES="x86_gcc2"
 
@@ -15,11 +13,13 @@ PROVIDES="
 	virtualbelive = $portVersion
 	app:VirtualBeLive = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
 
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
@@ -28,10 +28,6 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-BUILD_REQUIRES="
-	haiku_devel
-	"
-
 BUILD()
 {
 	make $jobArgs OBJ_DIR=objects
diff --git a/haiku-apps/vncserver/vncserver-1.26.recipe b/haiku-apps/vncserver/vncserver-1.26.recipe
index 49d8cae3e..c801594c4 100644
--- a/haiku-apps/vncserver/vncserver-1.26.recipe
+++ b/haiku-apps/vncserver/vncserver-1.26.recipe
@@ -1,4 +1,4 @@
-SUMMARY="Lets you use your Haiku computer from anywhere there is an Internet connection"
+SUMMARY="Use your Haiku computer from anywhere with an internet connection"
 DESCRIPTION="A VNC client (available elsewhere for Windows, Mac, Linux, \
 others) shows you what's on the remote Haiku computer's screen and sends \
 keystrokes and mouse actions over the Internet. The VNCServer software \
@@ -12,21 +12,23 @@ has an extremely well designed class structure, making it easy to do this \
 port). There are lots of VNC clients out there, but I can recommend the \
 RealVNC ones as working very well under Windows.  You can get their clients, \
 servers and source code at http://www.realvnc.com/"
-
 HOMEPAGE="http://web.ncf.ca/au829/resume.html#VNCServer"
+COPYRIGHT="2004 by Alexander G. M. Smith
+	1988,1989,1990,1991,1992 Richard Outerbridge (Public domain DES software \
+copyright)
+	1987, 1988, 1998 The Open Group and
+	1987, 1988 Digital Equipment Corporation (Software from the X Window \
+System)
+	1995-2002 Jean-loup Gailly and Mark Adler (Zlib compression software)
+	1996 Widget Workshop, Inc, by Dave Zimmerman, Jef Poskanzer (Java DES \
+software)"
 LICENSE="GNU GPL v2"
-COPYRIGHT="
-	2004 by Alexander G. M. Smith.
-	Public domain DES software copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
-	Software from the X Window System copyright 1987, 1988, 1998 by The Open Group, also copyright 1987, 1988 by Digital Equipment Corporation.
-	Zlib compression software copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-	Java DES software copyright (c) 1996 Widget Workshop, Inc, by Dave Zimmerman, Jef Poskanzer.
-	"
+REVISION="1"
 SOURCE_URI="http://www.agmsmith.ca/BeOS/VNCServer-4.0-BeOS-AGMS-1.26.zip"
 CHECKSUM_SHA256="2741819cfab1b547a9cf4d57d3ee0899b62351ec3830157902c47d69f4b1d4cc"
 SOURCE_DIR="VNCServer-4.0-BeOS-AGMS-$portVersion/Source Code"
+PATCHES="vncserver-1.26.patchset"
 
-REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
@@ -39,6 +41,7 @@ REQUIRES="
 	haiku
 	lib:libz
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libz
@@ -48,7 +51,6 @@ BUILD_PREREQUIRES="
 	cmd:jam
 	cmd:ld
 	"
-PATCHES="vncserver-1.26.patchset"
 
 BUILD()
 {
diff --git a/haiku-apps/vwget/vwget-20141229.recipe b/haiku-apps/vwget/vwget-20141229.recipe
index ae05b7fc9..e4117f199 100644
--- a/haiku-apps/vwget/vwget-20141229.recipe
+++ b/haiku-apps/vwget/vwget-20141229.recipe
@@ -1,12 +1,12 @@
-SUMMARY="A visual version for GNU's wget."
+SUMMARY="A visual version for GNU's wget"
 DESCRIPTION="VWGet is a visual frontend for GNU wget. You can both run it from \
 the command line, passing the same arguments you would pass to wget or launch \
 it as a normal app and select the URL and destination in the GUI."
 HOMEPAGE="https://github.com/HaikuArchives/VWGet"
-SOURCE_URI="git+https://github.com/HaikuArchives/VWGet.git#29ff74d068526c01edf7e1c0ef887a8f4fac252f"
-REVISION="1"
-LICENSE="GNU GPL v2"
 COPYRIGHT="1999 Santiago Lema"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="git+https://github.com/HaikuArchives/VWGet.git#29ff74d068526c01edf7e1c0ef887a8f4fac252f"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -17,6 +17,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
diff --git a/media-fonts/vl_gothic/vl_gothic-20140530.recipe b/media-fonts/vl_gothic/vl_gothic-20140530.recipe
index 14f213e17..6e14731db 100644
--- a/media-fonts/vl_gothic/vl_gothic-20140530.recipe
+++ b/media-fonts/vl_gothic/vl_gothic-20140530.recipe
@@ -1,33 +1,35 @@
-SUMMARY="A modern gothic font including Japanese, as well as Latin and Greek glyphs"
+SUMMARY="A modern gothic font including Japanese, Latin and Greek glyphs"
 DESCRIPTION="This package includes the VL Gothic (monospace) and VL PGothic \
 (proportional) fonts. Originally developed for the Vine Linux project, they \
-include glyphs suitable for rendering Japanese text, as well as Latin and Greek \
-alphabets.
+include glyphs suitable for rendering Japanese text, as well as Latin and \
+Greek alphabets.
 The fonts are based on the M+ fonts and the Sazanami fonts."
-HOMEPAGE="http://vlgothic.dicey.org/" 
-SOURCE_URI="http://sourceforge.jp/frs/redir.php?m=osdn&f=%2Fvlgothic%2F61261%2FVLGothic-20140530.tar.xz"
-CHECKSUM_SHA256="bbb0abceed9052ce1249d2d4a953110c9ee6184400e4ebb2f6ea14d4cc5e70a3"
-LICENSE="BSD (3-clause)
-	M+ Fonts Project
-	Sazanami Gothic Font
-"
+HOMEPAGE="http://vlgothic.dicey.org/"
 COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo.
 2003-2004 Electronic Font Open Laboratory (/efont/).
 2002-2014 M+ FONTS PROJECT
-2006-2014 Daisuke SUZUKI <daisuke@vinelinux.org>.
-2006-2014 Project Vine <Vine@vinelinux.org>.
-"
+2006-2014 Daisuke SUZUKI
+2006-2014 Project Vine"
+LICENSE="BSD (3-clause)
+	M+ Fonts Project
+	Sazanami Gothic Font"
 REVISION="2"
-
-ARCHITECTURES="any"
+SOURCE_URI="http://sourceforge.jp/frs/redir.php?m=osdn&f=%2Fvlgothic%2F61261%2FVLGothic-20140530.tar.xz"
+CHECKSUM_SHA256="bbb0abceed9052ce1249d2d4a953110c9ee6184400e4ebb2f6ea14d4cc5e70a3"
+SOURCE_DIR="VLGothic"
 DISABLE_SOURCE_PACKAGE=yes
 
-PROVIDES="vl_gothic = $portVersion"
-REQUIRES=""
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
+ARCHITECTURES="any"
 
-SOURCE_DIR="VLGothic"
+PROVIDES="
+	vl_gothic = $portVersion
+	"
+REQUIRES=""
+
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="
+	coreutils
+	"
 
 BUILD()
 {
diff --git a/media-fonts/vl_gothic/vl_gothic-20141206.recipe b/media-fonts/vl_gothic/vl_gothic-20141206.recipe
index f0647b9a5..176e18339 100644
--- a/media-fonts/vl_gothic/vl_gothic-20141206.recipe
+++ b/media-fonts/vl_gothic/vl_gothic-20141206.recipe
@@ -1,36 +1,37 @@
 SUMMARY="A modern gothic font including Japanese, Latin and Greek glyphs"
 DESCRIPTION="This package includes the VL Gothic (monospace) and VL PGothic \
 (proportional) fonts. Originally developed for the Vine Linux project, they \
-include glyphs suitable for rendering Japanese text, as well as Latin and Greek \
-alphabets.
-The fonts are based on the M+ fonts and the Sazanami fonts.
-"
+include glyphs suitable for rendering Japanese text, as well as Latin and \
+Greek alphabets.
+The fonts are based on the M+ fonts and the Sazanami fonts."
 HOMEPAGE="http://vlgothic.dicey.org/"
-SOURCE_URI="http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Fvlgothic%2F62375%2FVLGothic-20141206.tar.xz"
-CHECKSUM_SHA256="982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d"
-LICENSE="
-	BSD (3-clause)
-	M+ Fonts Project
-	Sazanami Gothic Font
-	"
 COPYRIGHT="
 	1990-2003 Wada Laboratory, the University of Tokyo
 	2003-2004 Electronic Font Open Laboratory (/efont/)
 	2002-2014 M+ FONTS PROJECT
 	2006-2014 Daisuke SUZUKI
-	2006-2014 Project Vine
-	"
+	2006-2014 Project Vine"
+LICENSE="
+	BSD (3-clause)
+	M+ Fonts Project
+	Sazanami Gothic Font"
 REVISION="1"
-
-ARCHITECTURES="any"
+SOURCE_URI="http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Fvlgothic%2F62375%2FVLGothic-20141206.tar.xz"
+CHECKSUM_SHA256="982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d"
+SOURCE_DIR="VLGothic"
 DISABLE_SOURCE_PACKAGE=yes
 
-PROVIDES="vl_gothic = $portVersion"
-REQUIRES=""
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
+ARCHITECTURES="any"
 
-SOURCE_DIR="VLGothic"
+PROVIDES="
+	vl_gothic = $portVersion
+	"
+REQUIRES=""
+
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="
+	coreutils
+	"
 
 BUILD()
 {
diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe
index 5b8fe9094..b64b7bd05 100644
--- a/media-video/vlc/vlc-0.8.6i.recipe
+++ b/media-video/vlc/vlc-0.8.6i.recipe
@@ -1,12 +1,14 @@
-SUMMARY="VLC Media Player" 
+SUMMARY="The popular cross-plattform media player"
 DESCRIPTION="VLC is a free and open source cross-platform multimedia player \
 and framework that plays most multimedia files as well as DVDs, Audio CDs, \
 VCDs, and various streaming protocols."
-HOMEPAGE="http://www.videolan.org/vlc/" 
+HOMEPAGE="http://www.videolan.org/vlc/"
+COPYRIGHT="1998-2008 VideoLan organization"
+LICENSE="GNU GPL v2"
 REVISION="1"
-
 SOURCE_URI="http://download.videolan.org/pub/vlc/0.8.6i/vlc-0.8.6i.tar.gz"
 CHECKSUM_SHA256="e99b3b49efd8cae8cf210ca69a5c81ceeac3b2e7d2b1e79df84c9abee4aa8426"
+PATCHES="vlc-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
@@ -15,13 +17,12 @@ PROVIDES="
 	vlc$secondaryArchSuffix = $portVersion
 	cmd:vlc
 	cmd:vlc_config
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libintl
 	lib:libiconv
-"
+	"
 
 PROVIDES_devel="
 	vlc_devel = $portVersion
@@ -34,13 +35,13 @@ PROVIDES_devel="
 	devel:libmemcpy3dn
 	devel:libmemcpymmx
 	devel:libmemcpymmxext
-"
-
+	"
 REQUIRES_devel="
 	vlc == $portVersion base
-"
+	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:liba52$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix == 53.61.100
 	devel:libbz2$secondaryArchSuffix
@@ -83,12 +84,11 @@ BUILD_REQUIRES="
 	devel:libvorbis$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
+	"
 # We need a recipe for an old version of this that will still build with gcc2.
 #	devel:libx264$secondaryArchSuffix
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:autoconf
 	cmd:bison
 	cmd:gcc$secondaryArchSuffix
@@ -99,9 +99,8 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	cmd:xargs
 	cmd:which
-"
+	"
 
-PATCHES="vlc-$portVersion.patchset"
 BUILD()
 {
 	autoconf
@@ -126,6 +125,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1998-2008 VideoLan organization"
diff --git a/media-video/vlc/vlc-2.2.1.recipe b/media-video/vlc/vlc-2.2.1.recipe
index b4a766047..826ec9df5 100644
--- a/media-video/vlc/vlc-2.2.1.recipe
+++ b/media-video/vlc/vlc-2.2.1.recipe
@@ -1,10 +1,14 @@
-SUMMARY="VLC Media Player"
+SUMMARY="The popular cross-plattform media player"
 DESCRIPTION="VLC is a free and open source cross-platform multimedia player \
 and framework that plays most multimedia files as well as DVDs, Audio CDs, \
 VCDs, and various streaming protocols."
 HOMEPAGE="http://www.videolan.org/vlc/" 
+COPYRIGHT="1998-2015"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="http://download.videolan.org/pub/videolan/vlc/2.2.1/vlc-2.2.1.tar.xz"
 CHECKSUM_SHA256="543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb"
+PATCHES="vlc-2.2.1.patch"
 
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -14,8 +18,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-REVISION="1"
-
 PROVIDES="
 	vlc$secondaryArchSuffix = $portVersion
 	cmd:vlc_wrapper$secondaryArchSuffix
@@ -55,7 +57,7 @@ REQUIRES="
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 #	lib:libgnutls$secondaryArchSuffix
-	lib:libgpg-error$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -98,16 +100,7 @@ REQUIRES="
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoreconf
-	cmd:g++${secondaryArchSuffix}	
-	cmd:gettext$secondaryArchSuffix	
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:xargs
-	"    
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
@@ -167,8 +160,16 @@ BUILD_REQUIRES="
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
-PATCHES="vlc-2.2.1.patch"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:g++${secondaryArchSuffix}
+	cmd:gettext$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:xargs
+	"
 
 BUILD()
 {
@@ -200,6 +201,3 @@ INSTALL()
 #	packageEntries devel \
 #		$developDir
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1998-2015"
diff --git a/sci-electronics/verilator/verilator-3.864.recipe b/sci-electronics/verilator/verilator-3.864.recipe
index dd7dd8a47..f9f5d8957 100644
--- a/sci-electronics/verilator/verilator-3.864.recipe
+++ b/sci-electronics/verilator/verilator-3.864.recipe
@@ -1,16 +1,21 @@
 SUMMARY="A fast C++ Verilog simulator"
-DESCRIPTION="
-Verilator is the fastest free Verilog HDL simulator, and beats most commercial simulators. It compiles synthesizable Verilog (not test-bench code!), plus some PSL, SystemVerilog and Synthesis assertions into C++ or SystemC code. It is designed for large projects where fast simulation performance is of primary concern, and is especially well suited to generate executable models of CPUs for embedded software design teams.
-"
+DESCRIPTION="Verilator is the fastest free Verilog HDL simulator, and \
+beats most commercial simulators. It compiles synthesizable Verilog (not \
+test-bench code!), plus some PSL, SystemVerilog and Synthesis assertions \
+into C++ or SystemC code. It is designed for large projects where fast \
+simulation performance is of primary concern, and is especially well suited \
+to generate executable models of CPUs for embedded software design teams."
 HOMEPAGE="http://www.veripool.org/wiki/verilator"
+COPYRIGHT="2006-2014 Wilson Snyder"
+LICENSE="GNU GPL v3"
+REVISION="2"
 SOURCE_URI="http://www.veripool.org/ftp/verilator-3.864.tgz"
 CHECKSUM_SHA256="f6734c2aa33946357d5abfd9211b4206297f9adf07dfc3186cbbba0d8c8842af"
-REVISION="2"
+PATCHES="verilator-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="verilator-$portVersion.patchset"
-
 PROVIDES="
 	verilator$secondaryArchSuffix = $portVersion
 	cmd:verilator$secondaryArchSuffix
@@ -18,13 +23,14 @@ PROVIDES="
 	cmd:verilator_bin_dbg$secondaryArchSuffix
 	cmd:verilator_profcfunc$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:perl
 	cmd:bison
@@ -48,6 +54,3 @@ TEST()
 {
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="Copyright 2006-2014 by Wilson Snyder"