From 3d129258915a3f9dd8e5c00cdbd6b9dd9bd2df7d Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 17 Mar 2018 22:48:00 +0000
Subject: [PATCH] libmaxminddb: bump to 1.3.2, add debuginfo. (#2341)

Also add cmd:pkg_config and call autoreconf.
---
 ...1.2.0.recipe => libmaxminddb-1.3.2.recipe} | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)
 rename dev-libs/libmaxminddb/{libmaxminddb-1.2.0.recipe => libmaxminddb-1.3.2.recipe} (77%)

diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.2.0.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.recipe
similarity index 77%
rename from dev-libs/libmaxminddb/libmaxminddb-1.2.0.recipe
rename to dev-libs/libmaxminddb/libmaxminddb-1.3.2.recipe
index aa4f03957..eed14194f 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.2.0.recipe
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.recipe
@@ -9,14 +9,14 @@ allows to look up an IP address in a GeoIP2 or MaxMind DB file. The \
 geoipupdate tool, available in a separate package, allows to download such \
 files."
 HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-COPYRIGHT="2013-2016 Maxmind"
+COPYRIGHT="2013-2018 Maxmind"
 LICENSE="Apache v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="$HOMEPAGE/releases/download/$portVersion/libmaxminddb-$portVersion.tar.gz"
-CHECKSUM_SHA256="1fe859ed714f94fc902a145453f7e1b5cd928718179ba4c4fcb7f6ae0df7ad37"
+CHECKSUM_SHA256="e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
@@ -26,10 +26,13 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="0.0.7"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libmaxminddb$secondaryArchSuffix = $portVersion
 	cmd:mmdblookup$commandSuffix
-	lib:libmaxminddb$secondaryArchSuffix = 0.0.7
+	lib:libmaxminddb$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,7 +40,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libmaxminddb${secondaryArchSuffix}_devel = $portVersion
-	devel:libmaxminddb$secondaryArchSuffix = 0.0.7
+	devel:libmaxminddb$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libmaxminddb$secondaryArchSuffix == $portVersion base
@@ -48,17 +51,21 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
 	cmd:automake
+	cmd:autoreconf
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	"
 
+defineDebugInfoPackage libmaxminddb$secondaryArchSuffix \
+	"$commandBinDir"/mmdblookup \
+	"$libDir"/libmaxminddb.so.$libVersion
+
 PATCH()
 {
 	# replace "[socket]" by "[socket network]" when searching getaddrinfo
@@ -69,10 +76,14 @@ PATCH()
 	# remove -pthread to allow "make check" to build.
 	sed -i -e "/^threads_t_CFLAGS/ s/ -pthread//" \
 		t/Makefile.am
+
+	sed -i -e "/^AM_.*FLAGS/ s/ -pthread//" \
+		bin/Makefile.am
 }
 
 BUILD()
 {
+	autoreconf -fi
 	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }