Merge pull request #551 from fbrosson/libmaxminddb

libmaxminddb: bump to version 1.2.0.

dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe

@@ -1,57 +0,0 @@
-SUMMARY="Manage and use Maxmind's GeoIP databases"
-DESCRIPTION="GeoIP is a database of IP addresses that allow mapping IPs to a
-physical location. The GeoIP database is distributed in a specific format, and
-this library is used to query the database."
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-COPYRIGHT="2013-2014 Maxmind"
-LICENSE="Apache v2"
-REVISION="1"
-SOURCE_URI="https://github.com/maxmind/libmaxminddb/releases/download/$portVersion/libmaxminddb-$portVersion.tar.gz"
-CHECKSUM_SHA256="260d2d56376c156da7ddecddec55621f5f1c4c6351e1f78116b8846c42ae7bce"
-
-ARCHITECTURES="!x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libmaxminddb$secondaryArchSuffix = $portVersion
-	cmd:mmdblookup$secondaryArchSuffix
-	lib:libmaxminddb$secondaryArchSuffix = 0.0.7 compat = 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	devel:libmaxminddb$secondaryArchSuffix = 0.0.7 compat = 0
-	"
-REQUIRES_devel="
-	libmaxminddb$secondaryArchSuffix == $portVersion base
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:awk
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	LDFLAGS=-lnetwork runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLib libmaxminddb
-	mkdir -p $developDir
-	mv $prefix/include $developDir/headers
-
-	packageEntries devel $developDir
-}
-
-TEST()
-{
-	make check
-}

dev-libs/libmaxminddb/libmaxminddb-1.2.0.recipe

@@ -0,0 +1,77 @@
+SUMMARY="Library for the MaxMind DB and GeoIP2 file formats"
+DESCRIPTION="The libmaxminddb library is a C library for reading MaxMind DB \
+files, including the GeoIP2 databases from MaxMind. This is a custom binary \
+format designed to facilitate fast lookups of IP addresses while allowing for \
+great flexibility in the type of data associated with an address.
+
+The libmaxminddb library comes with a command line utility, mmdblookup, which \
+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"
+LICENSE="Apache v2"
+REVISION="1"
+SOURCE_URI="$HOMEPAGE/releases/download/$portVersion/libmaxminddb-$portVersion.tar.gz"
+CHECKSUM_SHA256="1fe859ed714f94fc902a145453f7e1b5cd928718179ba4c4fcb7f6ae0df7ad37"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	libmaxminddb$secondaryArchSuffix = $portVersion
+	cmd:mmdblookup$commandSuffix
+	lib:libmaxminddb$secondaryArchSuffix = 0.0.7
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libmaxminddb${secondaryArchSuffix}_devel = $portVersion
+	devel:libmaxminddb$secondaryArchSuffix = 0.0.7
+	"
+REQUIRES_devel="
+	libmaxminddb$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	LDFLAGS=-lnetwork runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libmaxminddb
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$manDir/man3
+}
+
+TEST()
+{
+	make check
+}