From da4a889bc5d50058b2d8c010170a7b11d0ce0e51 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 15 Sep 2016 07:07:04 +0000
Subject: [PATCH] aalib: bump to 1.4rc5, reorder sections, drop unneeded patch.
 (#794)

Also update metadata and drop documentation on secondary arch.
---
 ...ib-1.4~rc4.recipe => aalib-1.4~rc5.recipe} | 82 ++++++++++---------
 media-libs/aalib/patches/aalib-1.4rc4.patch   | 10 ---
 2 files changed, 42 insertions(+), 50 deletions(-)
 rename media-libs/aalib/{aalib-1.4~rc4.recipe => aalib-1.4~rc5.recipe} (59%)
 delete mode 100644 media-libs/aalib/patches/aalib-1.4rc4.patch

diff --git a/media-libs/aalib/aalib-1.4~rc4.recipe b/media-libs/aalib/aalib-1.4~rc5.recipe
similarity index 59%
rename from media-libs/aalib/aalib-1.4~rc4.recipe
rename to media-libs/aalib/aalib-1.4~rc5.recipe
index 34c8ed168..8db285b08 100644
--- a/media-libs/aalib/aalib-1.4~rc4.recipe
+++ b/media-libs/aalib/aalib-1.4~rc5.recipe
@@ -1,46 +1,52 @@
 SUMMARY="An ASCII rendering 2D library"
-DESCRIPTION="
-aalib is a software library which allows applications to automatically convert \
-still and moving images into ASCII art.
-"
+DESCRIPTION="aalib is a software library which allows applications to \
+automatically convert still and moving images into ASCII art."
 HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
-SOURCE_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz"
-CHECKSUM_SHA256="0b214b98850f559e0a9ef7282de2ff336b094e1aacedefff3ffa50f07711db58"
+COPYRIGHT="1997-2001 Jam Hubicka, Thomas A. K. Kjaer, Tim Newsome, Kamil Toman"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz"
+CHECKSUM_SHA256="fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee"
 SOURCE_DIR="aalib-1.4.0"
-REVISION="3"
-LICENSE="Public Domain"
-COPYRIGHT="1997 Jam Hubicka"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	aalib$secondaryArchSuffix = $portVersion  compat >= 1
 	lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libaa$secondaryArchSuffix = 1.0.4 compat >= 1
+	cmd:aafire$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:aainfo$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:aalib_config$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:aasavefont$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:aatest$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	aalib$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:makeinfo
-	cmd:ranlib
-	"
-
-PATCHES="
-	aalib-1.4rc4.patch
+	cmd:ranlib$secondaryArchSuffix
 	"
 
 BUILD()
@@ -57,32 +63,28 @@ INSTALL()
 {
 	make install
 
-	# remove libtool files
-	rm $libDir/*.la
+	# remove libtool file
+	rm $libDir/libaa.la
 
-	prepareInstalledDevelLibs libaa
+	prepareInstalledDevelLib libaa
 	fixPkgconfig
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $documentationDir
+		maybe_documentationDir=
+	else
+		maybe_documentationDir=$documentationDir
+	fi
+
 	# devel package
 	packageEntries devel \
-				$binDir \
-				$dataDir \
-				$developDir \
-				$documentationDir
+		$binDir \
+		$dataDir \
+		$developDir \
+		$maybe_documentationDir
 }
 
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libaa$secondaryArchSuffix = 1.0.4 compat >= 1
-	cmd:aafire$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:aainfo$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:aalib_config$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:aasavefont$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:aatest$secondaryArchSuffix = $portVersion compat >= 1
-	"
-
-REQUIRES_devel="
-	aalib$secondaryArchSuffix == $portVersion base
-	"
+TEST()
+{
+	make check
+}
diff --git a/media-libs/aalib/patches/aalib-1.4rc4.patch b/media-libs/aalib/patches/aalib-1.4rc4.patch
deleted file mode 100644
index 52cf48b45..000000000
--- a/media-libs/aalib/patches/aalib-1.4rc4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- aalib-1.4.0/configure.in	2001-04-24 14:00:02.060293120 +0000
-+++ aalib-1.4.0-haiku/configure.in	2013-11-29 18:22:31.000000000 +0000
-@@ -4,6 +4,6 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
-
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
-
- dnl Initialize the compiler and linker flags for AALIB applications