code style.

remove old patches.

media-libs/leptonica/leptonica-1.69.recipe

@@ -8,11 +8,16 @@ and image analysis operations. It's long list of features includes:
 * can open and save standard image formats
 "
 HOMEPAGE="http://code.google.com/p/leptonica"
+COPYRIGHT="2001-2012 Dan Bloomberg"
+LICENSE="BSD (2-clause)"
+REVISION="2"
 SOURCE_URI="http://www.leptonica.org/source/leptonica-1.69.tar.gz"
 CHECKSUM_SHA256="3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2001-2012 Dan Bloomberg"
-REVISION="2"
+PATCHES="
+	giflib6.patch
+	leptonica-1.69.patch
+	"
+
 ARCHITECTURES="x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
@@ -21,7 +26,6 @@ PROVIDES="
 	lib:leptonica$secondaryArchSuffix = 3.0.0
 	lib:liblept$secondaryArchSuffix = 3.0.0
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
@@ -31,67 +35,16 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libgif$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:ar$secondaryArchSuffix
-	cmd:autoconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:makeinfo
-	"
-
-PATCHES="
-	giflib6.patch
-	leptonica-1.69.patch
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake -a
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	prepareInstalledDevelLibs liblept
-
-	packageEntries devel \
-				$developDir
-
-	packageEntries tools \
-				$binDir
-}
-
-# ----- devel package -------------------------------------------------------
-
 PROVIDES_devel="
 	leptonica${secondaryArchSuffix}_devel = $portVersion
 	devel:leptonica$secondaryArchSuffix = 3.0.0
 	devel:liblept$secondaryArchSuffix = 3.0.0
 	"
-
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
 
-# ----- tools package -------------------------------------------------------
-
 PROVIDES_tools="
 	leptonica${secondaryArchSuffix}_tools = $portVersion
 	cmd:adaptmaptest$secondaryArchSuffix = $portVersion
@@ -111,8 +64,8 @@ PROVIDES_tools="
 	cmd:binmorph3_reg$secondaryArchSuffix = $portVersion
 	cmd:binmorph4_reg$secondaryArchSuffix = $portVersion
 	cmd:binmorph5_reg$secondaryArchSuffix = $portVersion
-	cmd:blend_reg$secondaryArchSuffix = $portVersion
 	cmd:blend2_reg$secondaryArchSuffix = $portVersion
+	cmd:blend_reg$secondaryArchSuffix = $portVersion
 	cmd:blendcmaptest$secondaryArchSuffix = $portVersion
 	cmd:blendtest1$secondaryArchSuffix = $portVersion
 	cmd:buffertest$secondaryArchSuffix = $portVersion
@@ -168,10 +121,10 @@ PROVIDES_tools="
 	cmd:fhmtauto_reg$secondaryArchSuffix = $portVersion
 	cmd:fhmtautogen$secondaryArchSuffix = $portVersion
 	cmd:fileinfo$secondaryArchSuffix = $portVersion
-	cmd:findpattern_reg$secondaryArchSuffix = $portVersion
 	cmd:findpattern1$secondaryArchSuffix = $portVersion
 	cmd:findpattern2$secondaryArchSuffix = $portVersion
 	cmd:findpattern3$secondaryArchSuffix = $portVersion
+	cmd:findpattern_reg$secondaryArchSuffix = $portVersion
 	cmd:flipdetect_reg$secondaryArchSuffix = $portVersion
 	cmd:flipselgen$secondaryArchSuffix = $portVersion
 	cmd:fmorphauto_reg$secondaryArchSuffix = $portVersion
@@ -274,8 +227,8 @@ PROVIDES_tools="
 	cmd:seedspread_reg$secondaryArchSuffix = $portVersion
 	cmd:selio_reg$secondaryArchSuffix = $portVersion
 	cmd:sharptest$secondaryArchSuffix = $portVersion
-	cmd:shear_reg$secondaryArchSuffix = $portVersion
 	cmd:shear2_reg$secondaryArchSuffix = $portVersion
+	cmd:shear_reg$secondaryArchSuffix = $portVersion
 	cmd:sheartest$secondaryArchSuffix = $portVersion
 	cmd:showedges$secondaryArchSuffix = $portVersion
 	cmd:skew_reg$secondaryArchSuffix = $portVersion
@@ -309,3 +262,44 @@ REQUIRES_tools="
 	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgif$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:ar$secondaryArchSuffix
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake -a
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs liblept
+
+	packageEntries devel \
+				$developDir
+
+	packageEntries tools \
+				$binDir
+}