geos, bump version (#6869)

sci-libs/geos/geos-3.10.2.recipe

@@ -13,18 +13,26 @@ COPYRIGHT="2005-2006 Refractions Research Inc.
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.osgeo.org/geos/geos-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7"
+CHECKSUM_SHA256="50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="1.13.3"
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandSuffix=$secondaryArchSuffix
+	commandBinDir=$binDir
+else
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="1.16.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 portVersionCompat="$portVersion compat >= ${portVersion%.*}"
 
 PROVIDES="
 	geos$secondaryArchSuffix = $portVersionCompat
-	lib:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
+	lib:libgeos$secondaryArchSuffix = $portVersion
 	lib:libgeos_c$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -33,51 +41,60 @@ REQUIRES="
 
 PROVIDES_devel="
 	geos${secondaryArchSuffix}_devel = $portVersionCompat
-	cmd:geos_config$secondaryArchSuffix = $portVersionCompat
-	devel:libgeos$secondaryArchSuffix = $libVersionCompat
-	devel:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
+	cmd:geos_config$commandSuffix = $portVersionCompat
+	devel:libgeos$secondaryArchSuffix = $portVersion
 	devel:libgeos_c$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	geos$secondaryArchSuffix == $portVersion base
 	"
 
+PROVIDES_tools="
+	geos${secondaryArchSuffix}_tools = $portVersionCompat
+	cmd:geosop$commandSuffix
+	"
+REQUIRES_tools="
+	geos$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:find
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
 	cmd:make
-	cmd:which
 	"
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure ./configure
-	make $jobArgs
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
-	prepareInstalledDevelLibs libgeos_c libgeos libgeos-$portVersion
+	prepareInstalledDevelLibs libgeos_c libgeos
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-		$binDir \
-		$developDir
+		$commandBinDir/geos-config \
+		$developDir \
+		$libDir/cmake
+
+	# tools package
+	packageEntries tools \
+		$commandBinDir
 }
 
 TEST()
 {
-	make check
+	make -C build check
 }

sci-libs/geos/geos372-3.7.2.recipe

@@ -1,71 +0,0 @@
-SUMMARY="Geometry Engine Open Source"
-DESCRIPTION="GEOS is a C++ port of the Java Topology Suite (JTS). As such, \
-it aims to contain the complete functionality of JTS in C++. This includes \
-all the OpenGIS Simple Features for SQL spatial predicate functions and \
-spatial operators, as well as specific JTS enhanced topology functions."
-HOMEPAGE="https://trac.osgeo.org/geos"
-COPYRIGHT="2005-2006 Refractions Research Inc.
-	2012 Excensus LLC.
-	2001-2002 Vivid Solutions Inc.
-	2009-2012 Sandro Santilli
-	2008-2010 Safe Software Inc.
-	2008 Sean Gillies"
-LICENSE="GNU LGPL v2.1"
-REVISION="3"
-SOURCE_URI="https://download.osgeo.org/geos/geos-$portVersion.tar.bz2"
-CHECKSUM_SHA256="2166e65be6d612317115bfec07827c11b403c3f303e0a7420a2106bc999d7707"
-PATCHES="geos-$portVersion.patchset"
-SOURCE_DIR="geos-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-libVersion="1.11.2"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-portVersionCompat="$portVersion compat >= ${portVersion%.*}"
-
-PROVIDES="
-	geos372$secondaryArchSuffix = $portVersionCompat
-	lib:libgeos_${portVersion}$secondaryArchSuffix = $libVersionCompat
-	lib:libgeos_c$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	cmd:which
-	"
-
-BUILD()
-{
-	autoreconf -fi
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libgeos_c libgeos libgeos-$portVersion
-	fixPkgconfig
-
-	rm -rf $binDir $developDir
-}
-
-TEST()
-{
-	make test
-}

sci-libs/geos/patches/geos-3.7.2.patchset

@@ -1,36 +0,0 @@
-From af2cdb5de71a84339b89d835b223eb0e8274fa69 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Fri, 22 Aug 2014 14:30:31 +0000
-Subject: haiku patch
-
-
-diff --git a/configure.ac b/configure.ac
-index 7158394..ea17b55 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,7 +196,8 @@ dnl of isnan().
- 
- AC_LANG_PUSH([C++])
- AC_CACHE_CHECK([for isnan], ac_cv_isnan,
-- [AC_TRY_LINK([#include <cmath>],
-+ [AC_TRY_LINK([#include <cmath>
-+#include <math.h>],
-  [double x; int y; y = std::isnan(x);],
-  ac_cv_isnan=yes,
-  ac_cv_isnan=no
-diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
-index c3bc9c8..1c8db14 100644
---- a/include/geos/platform.h.in
-+++ b/include/geos/platform.h.in
-@@ -93,7 +93,7 @@ extern "C"
- # elif defined(__MINGW32__) || defined(__CYGWIN__)
- // sandro furieri: sanitizing MinGW32
- #  define ISNAN(x) (std::isnan(x))
--# elif defined(__OSX__) || defined(__APPLE__) || \
-+# elif defined(__OSX__) || defined(__APPLE__) || defined(__HAIKU__) || \
-        defined(__NetBSD__) || defined(__DragonFly__) || defined (__OpenBSD__) || \
-        (defined(__sun) && defined(__GNUC__))
-    // Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
--- 
-2.14.2
-