From 86e97737a8f7eaf6d455d19d3f43f37c2f5fd629 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 26 Dec 2013 01:01:25 -0600
Subject: [PATCH] libzip: Fix recipe, add new version with configure

* cmake version didn't create pkgconfig
---
 dev-libs/libzip/libzip-0.10.1.recipe | 65 +++++++++++++++++++++---
 dev-libs/libzip/libzip-0.11.2.recipe | 75 ++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 7 deletions(-)
 create mode 100644 dev-libs/libzip/libzip-0.11.2.recipe

diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe
index 11d333880..4975d1381 100644
--- a/dev-libs/libzip/libzip-0.10.1.recipe
+++ b/dev-libs/libzip/libzip-0.10.1.recipe
@@ -1,24 +1,75 @@
+SUMMARY="A C library for reading, creating, and modifying zip archives."
 DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." 
 HOMEPAGE="http://www.nih.at/libzip/" 
 SRC_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2"
 CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libzip${secondaryArchSuffix} = $portVersion
+	lib:libzip${secondaryArchSuffix} = $portVersion
+	cmd:zipcmp${secondaryArchSuffix}
+	cmd:zipmerge${secondaryArchSuffix}
+	cmd:ziptorrent${secondaryArchSuffix}
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	cd libzip-0.10.1
-	sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt
 	sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt
-	cmake .
-	make
+
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libzip-0.10.1
 	make install
+
+	# clean up includes
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir/
+	rm -rf $prefix/include
+
+	# clean up man pages
+	mkdir -p $manDir
+	mv $prefix/man/* $manDir/
+	rm -rf $prefix/man
+
+    prepareInstalledDevelLibs \
+        libzip \
+
+    fixPkgconfig
+
+    # devel package
+    packageEntries devel \
+        $developDir
 }
 
+PROVIDES_devel="
+	libzip${secondaryArchSuffix}_devel = $portVersion
+	devel:libzip$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libzip$secondaryArchSuffix == $portVersion base
+	"
+
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"
diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe
new file mode 100644
index 000000000..9d22f1f4d
--- /dev/null
+++ b/dev-libs/libzip/libzip-0.11.2.recipe
@@ -0,0 +1,75 @@
+SUMMARY="A C library for reading, creating, and modifying zip archives."
+DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." 
+HOMEPAGE="http://www.nih.at/libzip/" 
+SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz"
+CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libzip${secondaryArchSuffix} = $portVersion
+	lib:libzip${secondaryArchSuffix} = $portVersion
+	cmd:zipcmp${secondaryArchSuffix}
+	cmd:zipmerge${secondaryArchSuffix}
+	cmd:ziptorrent${secondaryArchSuffix}
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	sed -i 's/LN = ln/LN = cp/' man/Makefile.in
+
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+#	# clean up includes
+#	mkdir -p $includeDir
+#	mv $prefix/include/* $includeDir/
+#	rm -rf $prefix/include
+#
+#	# clean up man pages
+#	mkdir -p $manDir
+#	mv $prefix/man/* $manDir/
+#	rm -rf $prefix/man
+
+    prepareInstalledDevelLibs \
+        libzip \
+
+    fixPkgconfig
+
+    # devel package
+    packageEntries devel \
+        $developDir
+}
+
+PROVIDES_devel="
+	libzip${secondaryArchSuffix}_devel = $portVersion
+	devel:libzip$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	libzip$secondaryArchSuffix == $portVersion base
+	"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner"