From 7ee67696bcaa35ac7d019da481ddc69f68ae3751 Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@users.noreply.github.com>
Date: Thu, 2 Nov 2017 18:58:23 +0100
Subject: [PATCH] lizard: recipe cleanup and fix (#1765)

---
 app-arch/lizard/lizard-1.0.recipe           | 47 +++++++++++++--------
 app-arch/lizard/patches/lizard-1.0.patchset |  0
 2 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 app-arch/lizard/patches/lizard-1.0.patchset

diff --git a/app-arch/lizard/lizard-1.0.recipe b/app-arch/lizard/lizard-1.0.recipe
index 05dbcd496..c18a6ed7d 100644
--- a/app-arch/lizard/lizard-1.0.recipe
+++ b/app-arch/lizard/lizard-1.0.recipe
@@ -12,25 +12,23 @@ HOMEPAGE="https://github.com/inikep/lizard/"
 COPYRIGHT="2011-2017, Yann Collet
 	2015-2017, Przemyslaw Skibinski"
 LICENSE="BSD (2-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="lizard-$portVersion.tar.gz"
 CHECKSUM_SHA256="6f666ed699fc15dc7fdaabfaa55787b40ac251681b50c0d8df017c671a9457e6"
-#PATCHES="lizard-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	lizard${secondaryArchSuffix} = $portVersion
-	lib:liblizard${secondaryArchSuffix} = 2.0.0 compat >= 2
+	lib:liblizard${secondaryArchSuffix} = 1.0.0 compat >= 1
 	"
-
 if [ -z "$secondaryArchSuffix" ]; then
 PROVIDES="$PROVIDES
 	cmd:lizard = $portVersion
-#	cmd:lz5cat = $portVersion
-#	cmd:unlz5 = $portVersion
+	cmd:lizardcat = $portVersion
+	cmd:unlizard = $portVersion
 	"
 fi
 
@@ -43,13 +41,14 @@ PROVIDES_devel="
 	devel:liblizard$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES_devel="
-	lizard${secondaryArchSuffix} == $portVersion base
+	lizard$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:diff
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -57,23 +56,35 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make -j1 all
+	make $jobArgs all PREFIX=$prefix
 }
 
 INSTALL()
 {
-	make install LIBDIR=$libDir INCLUDEDIR=$includeDir \
-		BINDIR=$binDir MANDIR=$manDir/man1
+	mkdir -p $libDir $includeDir $binDir $manDir/man1
+
+	make install PREFIX=$prefix
+
+	mv $prefix/include/* $includeDir
+	rm -rf $prefix/include
+
+	mv $prefix/share/man/man1/* $manDir/man1
+	rm -rf $prefix/share
 
 	if [ -n "$secondaryArchSuffix" ]; then
 		rm $binDir/lizard
-		rm $binDir/lz5cat
-		rm $binDir/unlz5
+		rm $binDir/lizardcat
+		rm $binDir/unlizard
 	fi
 
-#	prepareInstalledDevelLib lib
-#	fixPkgconfig
+	prepareInstalledDevelLib liblizard
+	fixPkgconfig
 
-#	packageEntries devel \
-#    	$developDir
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make test
 }
diff --git a/app-arch/lizard/patches/lizard-1.0.patchset b/app-arch/lizard/patches/lizard-1.0.patchset
deleted file mode 100644
index e69de29bb..000000000