diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
index fe6d9f94d..2b2d2a2c4 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
@@ -1,33 +1,35 @@
-SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
-DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media.
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
+DESCRIPTION="Cdrtools is a set of command line programs that allows to \
+record CD/DVD/BluRay media.
 
 The suite includes the following programs:
-
-    cdrecord  A CD/DVD/BD recording program
-    readcd    A program to read CD/DVD/BD media with CD-clone features
-    cdda2wav  The most evolved CD-audio extraction program with paranoia support
-    mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes
-    isodebug  A program to print mkisofs debug information from media
-    isodump   A program to dump ISO-9660 media
-    isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
-    isovfy    A program to verify the ISO-9660 structures
-    rscsi     A Remote SCSI enabling daemon
-    "
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.berlios.de"
-COPYRIGHT="
-	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
-	1995-2012 J. Schilling (cdrecord)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+COPYRIGHT="1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
+	1995-2012 J. Schilling (cdrecord)"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="3"
 SOURCE_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2"
 CHECKSUM_SHA256="cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428"
-REVISION="3"
+SOURCE_DIR="cdrtools-3.01"
+PATCHES='cdrtools-3.01~a07.patch'
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PATCHES='cdrtools-3.01~a07.patch'
+GLOBAL_WRITABLE_FILES="
+	settings/cdrecord keep-old
+	settings/rscsi keep-old
+	"
 
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
@@ -51,7 +53,30 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
@@ -61,13 +86,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/cdrecord keep-old
-	settings/rscsi keep-old
-	"
-
-SOURCE_DIR="cdrtools-3.01"
-
 patchInsdir()
 {
 	# Usage: patchInsdir <oldDir> <newDir> <file> ...
@@ -132,26 +150,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cdrtools_devel = $portVersion
-	devel:libcdrdeflt = $portVersion compat >= 3
-	devel:libedc_ecc = $portVersion compat >= 3
-	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
-	devel:libfile = $portVersion compat >= 3
-	devel:libfind = $portVersion compat >= 3
-	devel:libhfs = $portVersion compat >= 3
-	devel:libmdigest = $portVersion compat >= 3
-	devel:libparanoia = $portVersion compat >= 3
-	devel:librscg = $portVersion compat >= 3
-	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
-	devel:libscgcmd = $portVersion compat >= 3
-	devel:libschily = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	cdrtools == $portVersion
-	"
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
index 1c8b1dc15..2aca62a19 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
@@ -1,33 +1,35 @@
-SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
-DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media.
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
+DESCRIPTION="Cdrtools is a set of command line programs that allows to record \
+CD/DVD/BluRay media.
 
 The suite includes the following programs:
-
-    cdrecord  A CD/DVD/BD recording program 
-    readcd    A program to read CD/DVD/BD media with CD-clone features 
-    cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-    mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes 
-    isodebug  A program to print mkisofs debug information from media 
-    isodump   A program to dump ISO-9660 media 
-    isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-    isovfy    A program to verify the ISO-9660 structures 
-    rscsi     A Remote SCSI enabling daemon
-    "
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.berlios.de" 
-COPYRIGHT="
-	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
-	1995-2013 J. Schilling (cdrecord)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+COPYRIGHT="1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
+	1995-2013 J. Schilling (cdrecord)"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"
 SOURCE_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2"
 CHECKSUM_SHA256="3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa"
-REVISION="1"
+SOURCE_DIR="cdrtools-3.01"
+PATCHES='cdrtools-3.01~a17.patch'
+
 ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES='cdrtools-3.01~a17.patch'
+GLOBAL_WRITABLE_FILES="
+	settings/cdrecord keep-old
+	settings/rscsi keep-old
+	"
 
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
@@ -51,23 +53,38 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:sed
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/cdrecord keep-old
-	settings/rscsi keep-old
-	"
-
-SOURCE_DIR="cdrtools-3.01"
-
 patchInsdir()
 {
 	# Usage: patchInsdir <oldDir> <newDir> <file> ...
@@ -132,26 +149,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cdrtools_devel = $portVersion
-	devel:libcdrdeflt = $portVersion compat >= 3
-	devel:libedc_ecc = $portVersion compat >= 3
-	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
-	devel:libfile = $portVersion compat >= 3
-	devel:libfind = $portVersion compat >= 3
-	devel:libhfs = $portVersion compat >= 3
-	devel:libmdigest = $portVersion compat >= 3
-	devel:libparanoia = $portVersion compat >= 3
-	devel:librscg = $portVersion compat >= 3
-	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
-	devel:libscgcmd = $portVersion compat >= 3
-	devel:libschily = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	cdrtools == $portVersion
-	"
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
index f5dc1f1e8..6b105087c 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
@@ -1,35 +1,31 @@
-SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
 DESCRIPTION="
 Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
 media.
 The suite includes the following programs:
-- cdrecord  A CD/DVD/BD recording program 
-- readcd    A program to read CD/DVD/BD media with CD-clone features 
-- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with \
-optional Rock Ridge attributes 
-- isodebug  A program to print mkisofs debug information from media 
-- isodump   A program to dump ISO-9660 media 
-- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-- isovfy    A program to verify the ISO-9660 structures 
-- rscsi     A Remote SCSI enabling daemon
-"
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.berlios.de" 
-COPYRIGHT="
-	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
-	1995-2013 J. Schilling (cdrecord)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+COPYRIGHT="	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
+	1995-2013 J. Schilling (cdrecord)	"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"
 SOURCE_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2"
 CHECKSUM_SHA256="7e9ad9e00679bb0c0456455243eb41614a5a3395eebded9371a0c843dd3494d6"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86"
-
+SOURCE_DIR="cdrtools-3.01"
 PATCHES='cdrtools-3.01~a18.patch'
 
+ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
 	cmd:devdump = $portVersion compat >= 3
@@ -53,9 +49,31 @@ REQUIRES="
 	haiku
 	"
 BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
 	haiku_devel
+	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
@@ -67,8 +85,6 @@ GLOBAL_WRITABLE_FILES="
 	settings/rscsi keep-old
 	"
 
-SOURCE_DIR="cdrtools-3.01"
-
 patchInsdir()
 {
 	# Usage: patchInsdir <oldDir> <newDir> <file> ...
@@ -133,26 +149,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cdrtools_devel = $portVersion
-	devel:libcdrdeflt = $portVersion compat >= 3
-	devel:libedc_ecc = $portVersion compat >= 3
-	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
-	devel:libfile = $portVersion compat >= 3
-	devel:libfind = $portVersion compat >= 3
-	devel:libhfs = $portVersion compat >= 3
-	devel:libmdigest = $portVersion compat >= 3
-	devel:libparanoia = $portVersion compat >= 3
-	devel:librscg = $portVersion compat >= 3
-	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
-	devel:libscgcmd = $portVersion compat >= 3
-	devel:libschily = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	cdrtools == $portVersion
-	"
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a27.recipe b/app-cdr/cdrtools/cdrtools-3.01~a27.recipe
index 56d563dbe..ff7e1253a 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a27.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a27.recipe
@@ -1,35 +1,30 @@
-SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
-DESCRIPTION="
-Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
-media.
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
+DESCRIPTION="Cdrtools is a set of command line programs that allows to \
+record CD/DVD/BluRay media.
 The suite includes the following programs:
-- cdrecord  A CD/DVD/BD recording program 
-- readcd    A program to read CD/DVD/BD media with CD-clone features 
-- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with \
-optional Rock Ridge attributes 
-- isodebug  A program to print mkisofs debug information from media 
-- isodump   A program to dump ISO-9660 media 
-- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-- isovfy    A program to verify the ISO-9660 structures 
-- rscsi     A Remote SCSI enabling daemon
-"
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.org" 
-COPYRIGHT="
-	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
-	1995-2013 J. Schilling (cdrecord)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+COPYRIGHT="1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
+	1995-2013 J. Schilling (cdrecord)	"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"	
 SOURCE_URI="http://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.01a25.tar.bz2"
 CHECKSUM_SHA256="12c555263c9b56d83ea104918c0c6c7df41c3dd51206ae1986e88aed892b29be"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
+SOURCE_DIR="cdrtools-3.01"
 PATCHES='cdrtools-3.01~a25.patch'
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
 	cmd:devdump = $portVersion compat >= 3
@@ -52,10 +47,32 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
@@ -68,8 +85,6 @@ GLOBAL_WRITABLE_FILES="
 	settings/rscsi keep-old
 	"
 
-SOURCE_DIR="cdrtools-3.01"
-
 patchInsdir()
 {
 	# Usage: patchInsdir <oldDir> <newDir> <file> ...
@@ -134,26 +149,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cdrtools_devel = $portVersion
-	devel:libcdrdeflt = $portVersion compat >= 3
-	devel:libedc_ecc = $portVersion compat >= 3
-	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
-	devel:libfile = $portVersion compat >= 3
-	devel:libfind = $portVersion compat >= 3
-	devel:libhfs = $portVersion compat >= 3
-	devel:libmdigest = $portVersion compat >= 3
-	devel:libparanoia = $portVersion compat >= 3
-	devel:librscg = $portVersion compat >= 3
-	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
-	devel:libscgcmd = $portVersion compat >= 3
-	devel:libschily = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	cdrtools == $portVersion
-	"
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a29.recipe b/app-cdr/cdrtools/cdrtools-3.01~a29.recipe
index 8b7772898..c20048718 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a29.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a29.recipe
@@ -1,36 +1,33 @@
-SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
 DESCRIPTION="
 cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
 media.
 The suite includes the following programs:
-- cdrecord  A CD/DVD/BD recording program 
-- readcd    A program to read CD/DVD/BD media with CD-clone features 
-- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
-optional Rock Ridge attributes 
-- isodebug  A program to print mkisofs debug information from media 
-- isodump   A program to dump ISO-9660 media 
-- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-- isovfy    A program to verify the ISO-9660 structures 
-- rscsi     A Remote SCSI enabling daemon
-"
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.org" 
-COPYRIGHT="
-	1995-2015 Joerg Schilling (cdrecord, readcd)
+COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
 	1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
-	1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg Schilling (mkisofs)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+	1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
+Schilling (mkisofs)"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a29.tar.bz2"
 CHECKSUM_SHA256="3ad98ea911a4ee7811ecfc433b70dac3a3b9671eb71a55da9f4a7e08cb6fc247"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
+SOURCE_DIR="cdrtools-3.01"
 PATCHES='cdrtools-3.01~a29.patch'
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	cdrtools = $portVersion compat >= 3
 	cmd:devdump = $portVersion compat >= 3
@@ -53,10 +50,32 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc
 	cmd:grep
 	cmd:ld
@@ -69,8 +88,6 @@ GLOBAL_WRITABLE_FILES="
 	settings/rscsi keep-old
 	"
 
-SOURCE_DIR="cdrtools-3.01"
-
 patchInsdir()
 {
 	# Usage: patchInsdir <oldDir> <newDir> <file> ...
@@ -135,26 +152,3 @@ INSTALL()
 	packageEntries devel \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	cdrtools_devel = $portVersion
-	devel:libcdrdeflt = $portVersion compat >= 3
-	devel:libedc_ecc = $portVersion compat >= 3
-	devel:libedc_ecc_dec = $portVersion compat >= 3
-	devel:libdeflt = $portVersion compat >= 3
-	devel:libfile = $portVersion compat >= 3
-	devel:libfind = $portVersion compat >= 3
-	devel:libhfs = $portVersion compat >= 3
-	devel:libmdigest = $portVersion compat >= 3
-	devel:libparanoia = $portVersion compat >= 3
-	devel:librscg = $portVersion compat >= 3
-	devel:libscg = $portVersion compat >= 3
-	devel:libsiconv = $portVersion compat >= 3
-	devel:libscgcmd = $portVersion compat >= 3
-	devel:libschily = $portVersion compat >= 3
-	"
-REQUIRES_devel="
-	cdrtools == $portVersion
-	"
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a30.recipe b/app-cdr/cdrtools/cdrtools-3.01~a30.recipe
index 9bb222f02..9de9e0e1d 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a30.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a30.recipe
@@ -1,34 +1,31 @@
-SUMMARY="Cdrtools is a CD/DVD/Blu-ray premastering and recording software"
+SUMMARY="A CD/DVD/Blu-ray premastering and recording software"
 DESCRIPTION="cdrtools is a set of command line programs suitable for creating \
 and recording file system images to CD, DVD and Blu-ray media.
 
 The suite includes the following programs:
-- cdrecord  A CD/DVD/BD recording program 
-- readcd    A program to read CD/DVD/BD media with CD-clone features 
-- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
-- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
-optional Rock Ridge attributes 
-- isodebug  A program to print mkisofs debug information from media 
-- isodump   A program to dump ISO-9660 media 
-- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
-- isovfy    A program to verify the ISO-9660 structures 
-- rscsi     A Remote SCSI enabling daemon
-"
+- cdrecord: A CD/DVD/BD recording program
+- readcd: A program to read CD/DVD/BD media with CD-clone features
+- cdda2wav: The most evolved CD-audio extraction program with paranoia support
+- mkisofs: A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
+optional Rock Ridge attributes
+- isodebug: A program to print mkisofs debug information from media
+- isodump: A program to dump ISO-9660 media
+- isoinfo: A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems
+- isovfy: A program to verify the ISO-9660 structures
+- rscsi: A Remote SCSI enabling daemon"
 HOMEPAGE="http://cdrecord.org/" 
-COPYRIGHT="
-	1995-2015 Joerg Schilling (cdrecord, readcd)
+COPYRIGHT="1995-2015 Joerg Schilling (cdrecord, readcd)
 	1993-2004 Heiko Eissfeldt, 2004-2015 Joerg Schilling (cdda2wav)
-	1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg Schilling (mkisofs)
-	"
-LICENSE="
-	GNU GPL v2
-	CDDL v1
-	"
+	1993-1997 Eric Youngdale, 1997-2002 James Pearson, 1997-2015 Joerg \
+Schilling (mkisofs)"
+LICENSE="GNU GPL v2
+	CDDL v1"
+REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a30.tar.bz2"
 CHECKSUM_SHA256="5b9a2f98771c9d0097a1e7640727655ece2864eea95f38e5611af2b2f6e6d9cd"
 SOURCE_DIR="cdrtools-3.01"
 PATCHES="cdrtools-3.01~a30.patch"
-REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 GLOBAL_WRITABLE_FILES="
@@ -81,9 +78,9 @@ REQUIRES_devel="
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:find
 	cmd:gcc
 	cmd:grep