From 5f38a47cafae3a58e69f341cab1cc0f6f8538788 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 19 Oct 2016 23:21:07 +0000
Subject: [PATCH] jansson: bump to 2.9, drop libtool file. Minor changes.
 (#828)

---
 dev-libs/jansson/jansson-2.5.recipe | 72 -----------------------
 dev-libs/jansson/jansson-2.9.recipe | 89 +++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 72 deletions(-)
 delete mode 100644 dev-libs/jansson/jansson-2.5.recipe
 create mode 100644 dev-libs/jansson/jansson-2.9.recipe

diff --git a/dev-libs/jansson/jansson-2.5.recipe b/dev-libs/jansson/jansson-2.5.recipe
deleted file mode 100644
index 48bd5c08c..000000000
--- a/dev-libs/jansson/jansson-2.5.recipe
+++ /dev/null
@@ -1,72 +0,0 @@
-SUMMARY="A C library for encoding, decoding and manipulating JSON data"
-DESCRIPTION="
-Jansson is a C library for encoding, decoding and manipulating JSON data. It \
-features a simple and intuitive API and data model, comprehensive \
-documentation, no dependencies on other libraries, full unicode support \
-(UTF-8) and an extensive test suite."
-HOMEPAGE="http://www.digip.org/jansson/"
-COPYRIGHT="2009-2013 Petri Lehtinen
-	2011-2012 Basile Starynkevitch
-	2011-2012 Graeme Smecher"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="http://www.digip.org/jansson/releases/jansson-2.5.tar.gz"
-CHECKSUM_SHA256="dd8bbfb38ad5031ce88e066b14d3b7e9c7113243daa7f4cde1994b7fc90bb1b1"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	jansson$secondaryArchSuffix = $portVersion compat >= 2
-	libjansson$secondaryArchSuffix = 4.5.0 compat >= 4
-	lib:libjansson$secondaryArchSuffix = 4.5.0 compat >= 4
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libjansson${secondaryArchSuffix}_devel = $portVersion
-	devel:jansson$secondaryArchSuffix = 4.5.0 compat >= 4
-	devel:libjansson$secondaryArchSuffix = 4.5.0 compat >= 4
-	"
-REQUIRES_devel="
-	libjansson$secondaryArchSuffix == 4.5.0 base
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:awk
-	cmd:sed
-	"
-
-BUILD()
-{
-	sed -i 's/-Wextra/ /g' Makefile.*
-	sed -i 's/-Wdeclaration-after-statement/ /g' Makefile.*
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# devel package
-	prepareInstalledDevelLibs \
-		libjansson
-
-	fixPkgconfig
-	packageEntries devel \
-			$developDir
-}
-
-TEST()
-{
-	cd test
-	run-suites
-}
diff --git a/dev-libs/jansson/jansson-2.9.recipe b/dev-libs/jansson/jansson-2.9.recipe
new file mode 100644
index 000000000..050ea2604
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.9.recipe
@@ -0,0 +1,89 @@
+SUMMARY="A C library for encoding, decoding and manipulating JSON data"
+DESCRIPTION="Jansson is a C library for encoding, decoding and manipulating \
+JSON data. It features a simple and intuitive API and data model, \
+comprehensive documentation, no dependencies on other libraries, full unicode \
+support (UTF-8) and an extensive test suite."
+HOMEPAGE="http://www.digip.org/jansson/"
+COPYRIGHT="2009-2016 Petri Lehtinen
+	2011-2012 Basile Starynkevitch
+	2011-2012 Graeme Smecher"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="http://www.digip.org/jansson/releases/jansson-$portVersion.tar.bz2"
+CHECKSUM_SHA256="77094fc1e113da0e2e65479488a0719f859b8f5bde3a6a0da88a1c73a88b5698"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	jansson$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libjansson$secondaryArchSuffix = 4.9.0 compat >= 4
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libjansson${secondaryArchSuffix}_devel = $portVersion
+	devel:libjansson$secondaryArchSuffix = 4.9.0 compat >= 4
+	"
+REQUIRES_devel="
+	jansson$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autoheader
+	cmd:awk
+	cmd:cmp
+	cmd:diff
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+		sed -i \
+			-e "/AM_CFLAGS=/ s/ -Wextra//" \
+			-e "/AM_CFLAGS=/ s/ -Wdeclaration-after-statement//" \
+		configure.ac
+	fi
+}
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# remove libtool file
+	rm $libDir/libjansson.la
+
+	# devel package
+	prepareInstalledDevelLib libjansson
+
+	fixPkgconfig
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}