From 3b448a14a98c36d59ee0dcdf6e9a25bbe695d175 Mon Sep 17 00:00:00 2001
From: dacianf <dacianf@users.noreply.github.com>
Date: Fri, 3 Feb 2017 20:16:43 +0200
Subject: [PATCH] I've fixed 2 recipe, one for zziplib and one for zopfli
 (#937)

zziplib and zopfli recipes fixed
---
 dev-libs/zziplib/zziplib-0.13.59.recipe | 93 ++++++++++++++++++++-----
 sys-libs/zopfli/zopfli-1.0.1.recipe     | 38 ++++++++++
 sys-libs/zopfli/zopfli-999.recipe       | 26 -------
 3 files changed, 112 insertions(+), 45 deletions(-)
 create mode 100644 sys-libs/zopfli/zopfli-1.0.1.recipe
 delete mode 100644 sys-libs/zopfli/zopfli-999.recipe

diff --git a/dev-libs/zziplib/zziplib-0.13.59.recipe b/dev-libs/zziplib/zziplib-0.13.59.recipe
index 21c744de2..739cc37c3 100644
--- a/dev-libs/zziplib/zziplib-0.13.59.recipe
+++ b/dev-libs/zziplib/zziplib-0.13.59.recipe
@@ -1,31 +1,86 @@
-DESCRIPTION="
-Lightweight library used to easily extract data from files archived in a \
-single zip file.
-"
+SUMMARY="The zziplib extract data from archives in a single zip"
+DESCRIPTION="Lightweight library used to easily extract data from \
+files archived in a single zip file."
 HOMEPAGE="http://zziplib.sourceforge.net/"
-SOURCE_URI="http://sourceforge.net/projects/zziplib/files/zziplib13/0.13.59/zziplib-0.13.59.tar.bz2/download"
+COPYRIGHT="1999-2010 Guido Draheim"
+LICENSE="GNU LGPL v2.1
+	MPL v1.1"
+SOURCE_URI="https://downloads.sf.net/zziplib/zziplib-$portVersion.tar.bz2"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="14b5a6fc229afe9916d48358479568d3"
+CHECKSUM_SHA256="cbc90cef60ee498319258e464895f990bb2e6e08f245264d77e44b309c8c218f"
+
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	zziplib$secondaryArchSuffix = $portVersion
+	cmd:zziplib$secondaryArchSuffix = $portVersion
+	cmd:unzip_mem
+	cmd:unzzip
+	cmd:unzzipcat
+	cmd:unzzipcat_mem
+	cmd:unzzipcat_seeko
+	cmd:unzzipdir
+ 	cmd:unzzipdir_mem
+	cmd:zzcat
+	cmd:zzdir
+	cmd:zzxorcat
+	cmd:zzxorcopy
+	cmd:zzxordir
+	lib:libzzip_0$secondaryArchSuffix = 13.0.59 compat >= 13
+	lib:libzzipfseeko_0$secondaryArchSuffix = 13.0.59 compat >= 13
+	lib:libzzipmmapped_0$secondaryArchSuffix = 13.0.59 compat >= 13
+	lib:libzzipwrap_0$secondaryArchSuffix = 13.0.59 compat >= 13
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	zziplib${secondaryArchSuffix}_devel = $portVersion
+	devel:libzzip$secondaryArchSuffix = 13.0.59 compat >= 13
+	devel:libzzipfseeko$secondaryArchSuffix = 13.0.59 compat >= 13
+	devel:libzzipmmapped$secondaryArchSuffix = 13.0.59 compat >= 13
+	devel:libzzipwrap$secondaryArchSuffix = 13.0.59 compat >= 13
+	"
+REQUIRES_devel="
+	zziplib${secondaryArchSuffix}_devel == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoreconf$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:python2
+	"
+PATCH()
+{
+	sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac
+}
 BUILD()
 {
-	cd zziplib-0.13.59
-	sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd zziplib-0.13.59
 	make install
+	rm $libDir/libzzip*.la
+	prepareInstalledDevelLibs \
+		libzzip \
+		libzzipfseeko \
+		libzzipmmapped \
+		libzzipwrap
+	packageEntries devel \
+		$developDir
 }
-LICENSE="GNU LGPL v2.1
-	MPL v1.1"
-COPYRIGHT="1999-2009 Guido Draheim"
diff --git a/sys-libs/zopfli/zopfli-1.0.1.recipe b/sys-libs/zopfli/zopfli-1.0.1.recipe
new file mode 100644
index 000000000..936607050
--- /dev/null
+++ b/sys-libs/zopfli/zopfli-1.0.1.recipe
@@ -0,0 +1,38 @@
+SUMMARY="This is a compression library"
+DESCRIPTION="Zopfli Compression Algorithm is a zlib (gzip, deflate) \
+compatible compressor programmed in C"
+HOMEPAGE="https://github.com/google/zopfli"
+COPYRIGHT="2011-2013 Google Inc."
+LICENSE="Apache v2"
+REVISION="1"
+SOURCE_URI="$HOMEPAGE/archive/zopfli-$portVersion.tar.gz"
+CHECKSUM_SHA256="29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4"
+SOURCE_DIR="zopfli-zopfli-$portVersion"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm ?ppc"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	zopfli$secondaryArchSuffix = $portVersion
+	cmd:zopfli$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp -r zopfli $binDir
+}
diff --git a/sys-libs/zopfli/zopfli-999.recipe b/sys-libs/zopfli/zopfli-999.recipe
deleted file mode 100644
index c50687876..000000000
--- a/sys-libs/zopfli/zopfli-999.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="Zopfli Compression Algorithm is a zlib (gzip, deflate) compatible compressor."
-HOMEPAGE="http://code.google.com/p/zopfli"
-SOURCE_URI="git+https://code.google.com/p/zopfli/"
-#CHECKSUM_MD5="abc123"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-
-BUILD()
-{
-	cd zopfli-999
-	sed -i 's/\-lm//' makefile
-	make
-}
-
-INSTALL()
-{
-	cd zopfli-999
-	BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
-	mkdir -p ${BINDIR}
-	cp -r zopfli ${BINDIR}/zopfli
-}
-
-LICENSE="Apache v2"
-COPYRIGHT="2011-2013 Google Inc."