diff --git a/x11-libs/cd/cd-5.8.recipe b/x11-libs/cd/cd-5.8.recipe
index ca473c1d5..2a61eed95 100644
--- a/x11-libs/cd/cd-5.8.recipe
+++ b/x11-libs/cd/cd-5.8.recipe
@@ -6,21 +6,26 @@ 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"
-LICENSE="MIT"
 COPYRIGHT="1994-2014 Tecgraf, PUC-Rio."
+LICENSE="MIT"
 REVISION="1"
+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"
+SOURCE_DIR="cd"
+PATCHES="cd-5.8.patchset"
+
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	cd$secondaryArchSuffix = $portVersion
 	lib:libcd$secondaryArchSuffix = $portVersion
+	lib:libcdcontextplus$secondaryArchSuffix = $portVersion
 	lib:libcdgl$secondaryArchSuffix = $portVersion
 	lib:libcdlua51$secondaryArchSuffix = $portVersion
 	lib:libcdlua52$secondaryArchSuffix = $portVersion
+	lib:libcdluacontextplus51$secondaryArchSuffix = $portVersion
+	lib:libcdluacontextplus52$secondaryArchSuffix = $portVersion
 	lib:libcdluagl51$secondaryArchSuffix = $portVersion
 	lib:libcdluagl52$secondaryArchSuffix = $portVersion
 	lib:libcdluaim51$secondaryArchSuffix = $portVersion
@@ -28,19 +33,30 @@ PROVIDES="
 	lib:libcdluapdf51$secondaryArchSuffix = $portVersion
 	lib:libcdluapdf52$secondaryArchSuffix = $portVersion
 	lib:libcdpdf$secondaryArchSuffix = $portVersion
-	lib:libcdcontextplus$secondaryArchSuffix = $portVersion
-	lib:libcdluacontextplus51$secondaryArchSuffix = $portVersion
-	lib:libcdluacontextplus52$secondaryArchSuffix = $portVersion
-
 	lib:libftgl$secondaryArchSuffix = $portVersion
 	lib:libpdflib$secondaryArchSuffix = $portVersion
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
+	lib:libim$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
 PROVIDES_devel="
 	cd${secondaryArchSuffix}_devel = $portVersion
+
 	devel:libcd$secondaryArchSuffix = $portVersion
+	devel:libcdcontextplus$secondaryArchSuffix = $portVersion
 	devel:libcdgl$secondaryArchSuffix = $portVersion
 	devel:libcdlua51$secondaryArchSuffix = $portVersion
 	devel:libcdlua52$secondaryArchSuffix = $portVersion
+	devel:libcdluacontextplus51$secondaryArchSuffix = $portVersion
+	devel:libcdluacontextplus52$secondaryArchSuffix = $portVersion
 	devel:libcdluagl51$secondaryArchSuffix = $portVersion
 	devel:libcdluagl52$secondaryArchSuffix = $portVersion
 	devel:libcdluaim51$secondaryArchSuffix = $portVersion
@@ -48,28 +64,15 @@ PROVIDES_devel="
 	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
-	lib:libGLU$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
-	lib:libfontconfig$secondaryArchSuffix
-	lib:libim$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	"
+
 BUILD_REQUIRES="
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libglu$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libim$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix
@@ -78,17 +81,13 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:which
 	"
 
-SOURCE_DIR="cd"
-
-PATCHES="cd-5.8.patchset"
-
 BUILD()
 {
 	cd src