From 883f45c28deaadf2067d6c2b7102535ae9120445 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 22 Jul 2016 18:17:11 -0400
Subject: [PATCH] libunistring: Cleaned up layout.

Closes #679.
---
 .../libunistring/libunistring-0.9.6.recipe    | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libunistring/libunistring-0.9.6.recipe b/dev-libs/libunistring/libunistring-0.9.6.recipe
index 41fc5d46b..d56ba9691 100644
--- a/dev-libs/libunistring/libunistring-0.9.6.recipe
+++ b/dev-libs/libunistring/libunistring-0.9.6.recipe
@@ -2,35 +2,43 @@ SUMMARY="A library for manipulating Unicode strings"
 DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for \
 manipulating C strings according to the Unicode standard."
 HOMEPAGE="http://www.gnu.org/software/libunistring/"
-SOURCE_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-$portVersion.tar.gz"
-LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2014 Free Software Fundation, Inc."
+LICENSE="GNU LGPL v2.1"
+REVISION="2"
+SOURCE_URI="http://ftpmirror.gnu.org/libunistring/libunistring-$portVersion.tar.gz"
 CHECKSUM_SHA256="9625eec2507f4789ebb6fc48ebda98be0e0168979a2f68aa8b680bf8eeabbd47"
-REVISION="1"
+PATCHES="libunistring-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="libunistring-$portVersion.patchset"
-
 PROVIDES="
 	libunistring$secondaryArchSuffix = $portVersion compat >= 0
 	lib:libunistring$secondaryArchSuffix = 2.0.0 compat >= 2
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES=""
+PROVIDES_devel="
+	libunistring${secondaryArchSuffix}_devel = $portVersion
+	devel:libunistring$secondaryArchSuffix = 2.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libunistring$secondaryArchSuffix == $portVersion base
+	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:make
-	cmd:libtoolize
-	cmd:git
+	devel:libiconv$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:gperf
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	"
 
 BUILD()
@@ -48,12 +56,7 @@ INSTALL()
 		$developDir
 }
 
-# ----- Development package -----
-
-PROVIDES_devel="
-	libunistring${secondaryArchSuffix}_devel = $portVersion
-	devel:libunistring$secondaryArchSuffix = 2.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	libunistring$secondaryArchSuffix == $portVersion base
-	"
+TEST()
+{
+	make check
+}