diff --git a/app-arch/arc/arc-5.21p.recipe b/app-arch/arc/arc-5.21p.recipe
index ca1e76fed..6f6dbc4da 100644
--- a/app-arch/arc/arc-5.21p.recipe
+++ b/app-arch/arc/arc-5.21p.recipe
@@ -1,7 +1,6 @@
-SUMMARY="Create & extract files from DOS .ARC files"
-DESCRIPTION="
-Create & extract files from DOS .ARC files
-"
+SUMMARY="Create and extract files from DOS .ARC files"
+DESCRIPTION="This archiver let's you create and extract files in the old DOS \
+.ARC format."
 HOMEPAGE="http://arc.sourceforge.net/" 
 LICENSE="GNU GPL v2"
 COPYRIGHT="1985-2009 Thom Henderson"
@@ -17,15 +16,12 @@ PROVIDES="
 	cmd:arc = $portVersion
 	cmd:marc = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	"
-
 BUILD_REQUIRES="
 	cmd:make
 	cmd:gcc
@@ -33,7 +29,7 @@ BUILD_REQUIRES="
 
 BUILD()
 {
-	make
+	make $jobArgs
 }
 
 INSTALL()
diff --git a/app-shells/command_not_found/command_not_found-0.0.1.recipe b/app-shells/command_not_found/command_not_found-0.0.1.recipe
index 2da17aa21..26a89a405 100644
--- a/app-shells/command_not_found/command_not_found-0.0.1.recipe
+++ b/app-shells/command_not_found/command_not_found-0.0.1.recipe
@@ -1,9 +1,7 @@
 SUMMARY="Command-not-found program"
-DESCRIPTION="
-Command-not-found hooks into the command_not_found_handle  \
+DESCRIPTION="Command-not-found hooks into the command_not_found_handle  \
 to inform end users where to find an application if they don't have it. \
-It can also check for typos (a feature of zsh).
-"
+It can also check for typos (a feature of zsh)."
 HOMEPAGE="https://github.com/jrabbit-cnf/"
 SOURCE_URI="git+https://github.com/jrabbit/haiku-cnf.git#87cd5d0c212e377cffa5d3e2a00c143fe751c6fb"
 ARCHITECTURES="x86 x86_gcc2"
@@ -11,28 +9,30 @@ REVISION="1"
 DISABLE_SOURCE_PACKAGE="yes"
 
 LICENSE="GNU GPL v2"
-COPYRIGHT="(c) 2011 Jrabbit"
+COPYRIGHT="2011 Jrabbit"
 
 PROVIDES="
 	command_not_found = $portVersion
 	cmd:command_not_found = $portVersion
-"
+	"
 REQUIRES="
 	haiku
 	cmd:python
-"
+	"
 BUILD_REQUIRES="
 	cmd:python
-"
+	"
 POST_INSTALL_SCRIPTS="
 	boot/post-install/install_cnf.py
-"
+	"
+
+PATCHES="command_not_found-0.0.1.patchset"
+
 INSTALL()
 {
 	mkdir -p $binDir
 	install -m 0755 haiku_cnf.py $binDir/command_not_found
 
 	mkdir -p $postInstallDir
-	patch < "$portDir/install-script.patch"
 	mv install_cnf.py $postInstallDir
 }
diff --git a/app-shells/command_not_found/install-script.patch b/app-shells/command_not_found/patches/command_not_found-0.0.1.patchset
similarity index 81%
rename from app-shells/command_not_found/install-script.patch
rename to app-shells/command_not_found/patches/command_not_found-0.0.1.patchset
index 1e7d961de..2cdfb4774 100644
--- a/app-shells/command_not_found/install-script.patch
+++ b/app-shells/command_not_found/patches/command_not_found-0.0.1.patchset
@@ -1,5 +1,13 @@
---- install_cnf.py.orig	2014-01-04 15:27:36.568590336 +0000
-+++ install_cnf.py	2014-01-04 15:30:33.947126272 +0000
+From 475d61b3d40fc506e47a492fb9ef391f246cc2f3 Mon Sep 17 00:00:00 2001
+From: Humdinger <humdingerb@gmail.com>
+Date: Sun, 19 Jul 2015 09:51:15 +0200
+Subject: Creating patchset from original patch.
+
+
+diff --git a/install_cnf.py b/install_cnf.py
+index 3e976a3..4104419 100644
+--- a/install_cnf.py
++++ b/install_cnf.py
 @@ -1,32 +1,29 @@
  #!/bin/env python
  import os
@@ -46,3 +54,6 @@
      options.close()
 -os.system("install -m 755 haiku_cnf.py /boot/common/bin/command_not_found.py")
 \ No newline at end of file
+-- 
+2.2.2
+
diff --git a/dev-lang/brexx/brexx-1.3.2.recipe b/dev-lang/brexx/brexx-1.3.2.recipe
index 571165e17..d05f9a7ef 100644
--- a/dev-lang/brexx/brexx-1.3.2.recipe
+++ b/dev-lang/brexx/brexx-1.3.2.recipe
@@ -1,32 +1,28 @@
 SUMMARY="A REXX interpreter with Haiku scripting integration"
-DESCRIPTION="
-Rexx (Restructured Extended Executor) is an interpreted programming language \
-developed at IBM by Mike Cowlishaw. It is a structured, high-level programming \
-language designed for ease of learning and reading.
+DESCRIPTION="Rexx (Restructured Extended Executor) is an interpreted \
+programming language developed at IBM by Mike Cowlishaw. It is a structured, \
+high-level programming language designed for ease of learning and reading.
 
 BeBRexx 1.3.2 is the first public release of a port of Bill Vlachoudis' BRexx \
 version 1.3 to BeOS, a REXX interpreter with a number of improvements and \
 additions:
-* Support for BeOS application scripting.
+* Support for Haiku application scripting.
 * Support for running BRexx scripts from the desktop.
-* Additional functions and features.
-"
-REVISION="1"
-ARCHITECTURES="x86_gcc2"
+* Additional functions and features."
 HOMEPAGE="http://www.verifiedlogic.com/"
-LICENSE="
-Public Domain
-BSD (3-clause)
-"
-COPYRIGHT="
-1991-1999, Be Incorporated
-1999 Willy Langeveld
-1999 Vassilis Vlachoudis
-"
-
 SOURCE_URI="http://www.verifiedlogic.com/BeBRexx.zip"
 CHECKSUM_SHA256="0386a9f04e04a120af5785c034e254bbfedc24973e241fe744e6777b453c8055"
-SOURCE_DIR="BeBRexx"
+LICENSE="
+	Public Domain
+	BSD (3-clause)
+	"
+COPYRIGHT="
+	1991-1999, Be Incorporated
+	1999 Willy Langeveld
+	1999 Vassilis Vlachoudis
+	"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
 	brexx = $portVersion
@@ -34,19 +30,22 @@ PROVIDES="
 	cmd:Squares
 	cmd:rx
 	lib:libPortManager
-"
-
+	"
 REQUIRES="
 	haiku
-"
-
-BUILD_PREREQUIRES="
+	"
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend
-"
+	"
+
+SOURCE_DIR="BeBRexx"
+
+PATCHES="brexx-$portVersion.patchset"
 
 BUILD()
 {
diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
index 1aed725f5..0edd8884c 100644
--- a/dev-libs/apr_util/apr_util-1.3.10.recipe
+++ b/dev-libs/apr_util/apr_util-1.3.10.recipe
@@ -1,4 +1,27 @@
 SUMMARY="Apache Portable Runtime Utility Library"
+DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \
+create and maintain software libraries that provide a predictable and \
+consistent interface to underlying platform-specific implementations. The \
+primary goal is to provide an API to which software developers may code and be \
+assured of predictable if not identical behaviour regardless of the platform \
+on which their software is built, relieving them of the need to code special-\
+case conditions to work around or take advantage of platform-specific \
+deficiencies or features.
+
+To give a brief overview, the primary core subsystems of APR 1.x include \
+the following:
+
+- atomic operations
+- dynamic Shared Object loading
+- file I/O
+- locks (mutexes, condition variables, etc)
+- memory management (high performance allocators)
+- memory-mapped files
+- multicast Sockets
+- network I/O
+- shared memory
+- thread and Process management
+- various data structures (tables, hashes, priority queues, etc)"
 HOMEPAGE="http://apr.apache.org/"
 SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
 CHECKSUM_SHA256="7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
@@ -31,6 +54,9 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PATCHES="apr_util-1.3.10.patch"
+
+SOURCE_DIR="apr-util-$portVersion"
 
 BUILD()
 {
@@ -72,28 +98,4 @@ INSTALL()
 	fixPkgconfig
 }
 
-DESCRIPTION="
-	The mission of the Apache Portable Runtime (APR) project is to create 
-	and maintain software libraries that provide a predictable and consistent 
-	interface to underlying platform-specific implementations. The primary 
-	goal is to provide an API to which software developers may code and be 
-	assured of predictable if not identical behaviour regardless of the 
-	platform on which their software is built, relieving them of the need to 
-	code special-case conditions to work around or take advantage of 
-	platform-specific deficiencies or features.
-	
-	To give a brief overview, the primary core subsystems of APR 1.x include 
-	the following:
-	
-	- atomic operations
-	- dynamic Shared Object loading
-	- file I/O
-	- locks (mutexes, condition variables, etc)
-	- memory management (high performance allocators)
-	- memory-mapped files
-	- multicast Sockets
-	- network I/O
-	- shared memory
-	- thread and Process management
-	- various data structures (tables, hashes, priority queues, etc) 
-	"
+
diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe
index 14caedc29..88ce63885 100644
--- a/dev-libs/chmlib/chmlib-0.40.recipe
+++ b/dev-libs/chmlib/chmlib-0.40.recipe
@@ -1,15 +1,13 @@
-SUMMARY="A library for dealing with Microsoft ITSS/CHM format files."
-DESCRIPTION="
-chmlib is a small library designed for accessing MS ITSS files.  The ITSS file \
-format is used for Microsoft Html Help files (.chm), which have been the \
-predominant medium for software documentation from Microsoft during the past \
-several years, having superceded the previously used .hlp file format.
+SUMMARY="A library for dealing with Microsoft ITSS/CHM format files"
+DESCRIPTION="chmlib is a small library designed for accessing MS ITSS files. \
+The ITSS file format is used for Microsoft Html Help files (.chm), which have \
+been the predominant medium for software documentation from Microsoft during \
+the past several years, having superceded the previously used .hlp file format.
 Note that this is NOT the same as the OLE structured storage file format used \
 by MS Excel, Word, and so on.  Instead, it is a different file format which \
 fulfills a similar purpose.  Both file formats may be accessed via instances \
 of the IStorage COM interface, which is essentially an \"acts like a \
-filesystem\" interface.
-"
+filesystem\" interface."
 HOMEPAGE="http://www.jedrea.com/chmlib/"
 COPYRIGHT="
 	2003 Jed Wing
diff --git a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe
index 058e24e13..df262ded5 100644
--- a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe
+++ b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe
@@ -1,8 +1,6 @@
-SUMMARY="Cyberdogs SDL."
-DESCRIPTION="DOS third-person shooting game. \
-In this game, you get guns to shoot zombies and cyborgs. \
-For a DOS game, the graphics are pretty good. \
-This also comes with a map editor."
+SUMMARY="A third-person shooting DOS game"
+DESCRIPTION="In this game, you get guns to shoot zombies and cyborgs. \
+For a DOS game, the graphics are pretty good. It also comes with a map editor."
 HOMEPAGE="https://github.com/lmartinking/cdogs-sdl"
 SOURCE_URI="https://codeload.github.com/lmartinking/cdogs-sdl/zip/master"
 SOURCE_URI_2="https://codeload.github.com/lmartinking/cdogs-sdl-data/zip/master"
@@ -20,24 +18,21 @@ ARCHITECTURES="x86 x86_gcc2"
 PROVIDES="
 	Cyberdogs_SDL= $portVersion
 	app:Cyberdogs_SDL= $portVersion
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libsdl
 	lib:libsdl_mixer
-"
-
+	"
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libsdl
 	devel:libsdl_mixer
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
-"
+	"
 
 PATCH()
 {
diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe
index a946c27a2..54350c04a 100644
--- a/games-puzzle/colorcode/colorcode-0.7.2.recipe
+++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe
@@ -1,4 +1,4 @@
-SUMMARY="A free advanced MasterMind clone."
+SUMMARY="A free advanced MasterMind clone"
 DESCRIPTION="ColorCode is a free advanced MasterMind clone with lots of \
 different game variants, from the very easy up to really challenging ones. \
 You can combine any color count from 2-10 with any column count from 2-5 and \
@@ -26,27 +26,24 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	colorcode = $portVersion
 	app:ColorCode = $portVersion
-"
-
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libqtcore$secondaryArchSuffix < 5
 	lib:libqtgui$secondaryArchSuffix < 5
-"
-
+	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libqtcore$secondaryArchSuffix < 5
 	devel:libqtgui$secondaryArchSuffix < 5
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:qmake$secondaryArchSuffix
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:xres
-"
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/beshare/beshare-2.31.recipe b/haiku-apps/beshare/beshare-2.31.recipe
index 4745eefaa..fddec7193 100644
--- a/haiku-apps/beshare/beshare-2.31.recipe
+++ b/haiku-apps/beshare/beshare-2.31.recipe
@@ -4,7 +4,7 @@ It operates similarly to other such programs (Napster, Hotline, etc) \
 but with a few advantages:
 
 - BeShare allows you to upload or download any type of file, not just mp3.
-- When browsing files, you can see their attributes (similar to Be's Tracker \
+- When browsing files, you can see their attributes (similar Tracker's \
 view)
 - Your query is always \"live\", so if new files that match your query become \
 available, you will see them added to the results list right away (you won't \
@@ -12,8 +12,7 @@ have to click \"refresh\" or anything first)
 - BeShare includes a rudimentary chat mechanism for you social types.
 - BeShare supports any number of simultaneous uploads and downloads \
 in parallel, but will serialize simultaneous file requests to any \
-given host for efficiency.
-"
+given host for efficiency."
 COPYRIGHT="1999-2012 Jeremy Friesner"
 LICENSE="
 	Public Domain
@@ -24,8 +23,6 @@ SOURCE_URI="git+https://github.com/HaikuArchives/BeShare.git#b721fcc"
 SOURCE_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip"
 REVISION="1"
 CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340"
-PATCHES="beshare-$portVersion.patchset"
-
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -58,7 +55,7 @@ BUILD_PREREQUIRES="
 	makefile_engine
 	"
 
-PATCHES="beshare-4.patchset"
+PATCHES="beshare-$portVersion.patchset"
 
 BUILD()
 {
diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
index cd231a6a4..763741522 100644
--- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
+++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe
@@ -1,4 +1,4 @@
-SUMMARY="The desktop calculator which features a skin interface system."
+SUMMARY="A desktop calculator with a skinable interface"
 DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is \
 flexibly customizable. It works on Windows, BeOS, and Haiku. In this \
 application the word \"cover\" means a set of files for its design, \
@@ -13,20 +13,21 @@ ARCHITECTURES="x86_gcc2 ?x86"
 COPYRIGHT="2008 hiron@with.memail.jp"
 
 PROVIDES="
-        coveredcalc = $portVersion
-        app:CoveredCalc = $portVersion
-        "
-
+	coveredcalc = $portVersion
+	app:CoveredCalc = $portVersion
+	"
 REQUIRES="
-        haiku
-        "
-
+	haiku
+	"
 BUILD_REQUIRES="
-              haiku_devel
-              cmd:make
-              cmd:gcc
-              cmd:xres
-              "
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:svn
+	cmd:xres
+	"
 
 BUILD()
 {
diff --git a/sci-astronomy/celestia/celestia-1.6.1.recipe b/sci-astronomy/celestia/celestia-1.6.1.recipe
index 006d9165a..1746d86c5 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.recipe
+++ b/sci-astronomy/celestia/celestia-1.6.1.recipe
@@ -1,4 +1,4 @@
-SUMMARY="The free space simulation that lets you explore our universe in three dimensions"
+SUMMARY="The free space simulation to explore our universe in 3 dimensions"
 DESCRIPTION="Unlike most planetarium software, Celestia doesn't confine you to \
 the surface of the Earth. You can travel throughout the solar system, to any of \
 over 100,000 stars, or even beyond the galaxy.
@@ -33,7 +33,6 @@ PROVIDES="
 	celestia$secondaryArchSuffix = $portVersion
 	app:celestia$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lua$secondaryArchSuffix
@@ -44,7 +43,6 @@ REQUIRES="
 	lib:libglu$secondaryArchSuffix
 	lib:libglut$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	lua${secondaryArchSuffix}_devel
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index 23dbc1a39..3c3d87cde 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -1,15 +1,16 @@
-SUMMARY="Handy console-based calculator utility"
-DESCRIPTION="
-bc is an arbitrary precision numeric processing language. Syntax is similar to \
-C, but differs in many substantial areas. It supports interactive execution of \
-statements. bc is a utility included in the POSIX P1003.2/D11 draft standard.
-"
+SUMMARY="A console-based calculator utility"
+DESCRIPTION="bc is an arbitrary precision numeric processing language. Syntax \
+is similar to C, but differs in many substantial areas. It supports \
+interactive execution of statements. bc is a utility included in the POSIX \
+P1003.2/D11 draft standard."
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html" 
 SOURCE_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
 CHECKSUM_SHA256="4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
 REVISION="2"
-LICENSE="GNU GPL v2
-	GNU LGPL v2.1"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2.1
+	"
 COPYRIGHT="1991-2000 Free Software Foundation, Inc."
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
@@ -18,27 +19,22 @@ PROVIDES="
 	bc = $portVersion
 	cmd:bc
 	cmd:dc
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libfl >= 2
-"
-
+	"
 BUILD_REQUIRES="
 	haiku_devel
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
 	cmd:flex
 	cmd:bison
-"
+	"
 
-PATCHES="
-	bc-1.06.patch
-"
+PATCHES="bc-1.06.patchset"
 
 BUILD()
 {
diff --git a/x11-libs/cd/cd-5.8.recipe b/x11-libs/cd/cd-5.8.recipe
index 75914e99a..70910c657 100644
--- a/x11-libs/cd/cd-5.8.recipe
+++ b/x11-libs/cd/cd-5.8.recipe
@@ -1,13 +1,20 @@
-SUMMARY="CD (Canvas Draw) is a platform-independent graphics library."
+SUMMARY="A platform-independent graphics library"
+DESCRIPTION="CD (Canvas Draw) is a platform-independent graphics library. It \
+is implemented in several platforms using native graphics libraries: Microsoft \
+Windows (GDI) and X-Windows (XLIB).
+The library contains functions to support both vector and image applications, \
+and the visualization surface can be either a window or a more abstract \
+surface, such as Image, Clipboard, Metafile, PS, and so on."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/cd/"
-
 SOURCE_URI="http://heanet.dl.sourceforge.net/project/canvasdraw/$portVersion/Docs%20and%20Sources/cd-${portVersion}_Sources.zip"
 	# They have a tar.gz but the permissions are broken inside it (will create unreadable files)
 CHECKSUM_SHA256="533facb78db1638028740da472352a51d766518b8ab925ebd4c3ca90eb1cbb8e"
-PATCHES="cd-5.8.patchset"
+LICENSE="MIT"
+COPYRIGHT="1994-2014 Tecgraf, PUC-Rio."
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	cd$secondaryArchSuffix = $portVersion
 	lib:libcd$secondaryArchSuffix = $portVersion
@@ -28,7 +35,26 @@ PROVIDES="
 	lib:libftgl$secondaryArchSuffix = $portVersion
 	lib:libpdflib$secondaryArchSuffix = $portVersion
 	"
+PROVIDES_devel="
+	cd${secondaryArchSuffix}_devel = $portVersion
+	devel:libcd$secondaryArchSuffix = $portVersion
+	devel:libcdgl$secondaryArchSuffix = $portVersion
+	devel:libcdlua51$secondaryArchSuffix = $portVersion
+	devel:libcdlua52$secondaryArchSuffix = $portVersion
+	devel:libcdluagl51$secondaryArchSuffix = $portVersion
+	devel:libcdluagl52$secondaryArchSuffix = $portVersion
+	devel:libcdluaim51$secondaryArchSuffix = $portVersion
+	devel:libcdluaim52$secondaryArchSuffix = $portVersion
+	devel:libcdluapdf51$secondaryArchSuffix = $portVersion
+	devel:libcdluapdf52$secondaryArchSuffix = $portVersion
+	devel:libcdpdf$secondaryArchSuffix = $portVersion
+	devel:libcdcontextplus$secondaryArchSuffix = $portVersion
+	devel:libcdluacontextplus51$secondaryArchSuffix = $portVersion
+	devel:libcdluacontextplus52$secondaryArchSuffix = $portVersion
 
+	devel:libftgl$secondaryArchSuffix = $portVersion
+	devel:libpdflib$secondaryArchSuffix = $portVersion
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
@@ -38,8 +64,7 @@ REQUIRES="
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libim$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
-"
-
+	"
 BUILD_REQUIRES="
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
@@ -50,8 +75,7 @@ BUILD_REQUIRES="
 	devel:liblua$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-"
-
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:make
@@ -59,10 +83,12 @@ BUILD_PREREQUIRES="
 	cmd:as$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
-"
+	"
 
 SOURCE_DIR="cd"
 
+PATCHES="cd-5.8.patchset"
+
 BUILD()
 {
 	cd src
@@ -110,35 +136,3 @@ TEST()
 	#popd
 	#../bin/Haiku11/cdtest
 }
-
-PROVIDES_devel="
-	cd${secondaryArchSuffix}_devel = $portVersion
-	devel:libcd$secondaryArchSuffix = $portVersion
-	devel:libcdgl$secondaryArchSuffix = $portVersion
-	devel:libcdlua51$secondaryArchSuffix = $portVersion
-	devel:libcdlua52$secondaryArchSuffix = $portVersion
-	devel:libcdluagl51$secondaryArchSuffix = $portVersion
-	devel:libcdluagl52$secondaryArchSuffix = $portVersion
-	devel:libcdluaim51$secondaryArchSuffix = $portVersion
-	devel:libcdluaim52$secondaryArchSuffix = $portVersion
-	devel:libcdluapdf51$secondaryArchSuffix = $portVersion
-	devel:libcdluapdf52$secondaryArchSuffix = $portVersion
-	devel:libcdpdf$secondaryArchSuffix = $portVersion
-	devel:libcdcontextplus$secondaryArchSuffix = $portVersion
-	devel:libcdluacontextplus51$secondaryArchSuffix = $portVersion
-	devel:libcdluacontextplus52$secondaryArchSuffix = $portVersion
-
-	devel:libftgl$secondaryArchSuffix = $portVersion
-	devel:libpdflib$secondaryArchSuffix = $portVersion
-"
-
-LICENSE="MIT"
-COPYRIGHT="1994-2014 Tecgraf, PUC-Rio."
-DESCRIPTION="
-CD (Canvas Draw) is a platform-independent graphics library. It is implemented \
-in several platforms using native graphics libraries: Microsoft Windows (GDI) \
-and X-Windows (XLIB).
-The library contains functions to support both vector and image applications, \
-and the visualization surface can be either a window or a more abstract \
-surface, such as Image, Clipboard, Metafile, PS, and so on.
-"