diff --git a/sci-libs/geos/geos-3.6.2.recipe b/sci-libs/geos/geos-3.6.2.recipe deleted file mode 100644 index 5b451c87c..000000000 --- a/sci-libs/geos/geos-3.6.2.recipe +++ /dev/null @@ -1,74 +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="http://trac.osgeo.org/geos" -COPYRIGHT="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="2" -SOURCE_URI="http://download.osgeo.org/geos/geos-$portVersion.tar.bz2" -CHECKSUM_SHA256="045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a" -PATCHES="geos-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - geos$secondaryArchSuffix = $portVersion compat >= 3.6 - lib:libgeos_3.6.2$secondaryArchSuffix = $portVersion compat >= 3.6 - lib:libgeos_c$secondaryArchSuffix = 1.10.2 compat >= 1 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.6 - cmd:geos_config$secondaryArchSuffix - devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.6 - devel:libgeos_3.6.2$secondaryArchSuffix = $portVersion compat >= 3.6 - devel:libgeos_c$secondaryArchSuffix = 1.10.2 compat >= 1 - " -REQUIRES_devel=" - geos$secondaryArchSuffix == $portVersion base - " - -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 - " - -BUILD() -{ - autoreconf -fi - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libgeos_c libgeos libgeos-3.6.2 - fixPkgconfig - - # devel package - packageEntries devel \ - $binDir \ - $developDir -} diff --git a/sci-libs/geos/geos-3.4.2.recipe b/sci-libs/geos/geos-3.7.2.recipe similarity index 65% rename from sci-libs/geos/geos-3.4.2.recipe rename to sci-libs/geos/geos-3.7.2.recipe index 9b294cf74..016d94548 100644 --- a/sci-libs/geos/geos-3.4.2.recipe +++ b/sci-libs/geos/geos-3.7.2.recipe @@ -4,36 +4,36 @@ 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="http://trac.osgeo.org/geos" -COPYRIGHT="2006 Refractions Research Inc. +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="2" +REVISION="1" SOURCE_URI="http://download.osgeo.org/geos/geos-$portVersion.tar.bz2" -CHECKSUM_SHA256="15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53" +CHECKSUM_SHA256="2166e65be6d612317115bfec07827c11b403c3f303e0a7420a2106bc999d7707" PATCHES="geos-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - geos$secondaryArchSuffix = $portVersion compat >= 3.4 - lib:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4 - lib:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1 + geos$secondaryArchSuffix = $portVersion compat >= 3.7 + lib:libgeos_${portVersion}$secondaryArchSuffix = $portVersion compat >= 3.7 + lib:libgeos_c$secondaryArchSuffix = 1.11.2 compat >= 1 " REQUIRES=" haiku$secondaryArchSuffix " PROVIDES_devel=" - geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.4 + geos${secondaryArchSuffix}_devel = $portVersion compat >= 3.7 cmd:geos_config$secondaryArchSuffix - devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.4 - devel:libgeos_3.4.2$secondaryArchSuffix = $portVersion compat >= 3.4 - devel:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1 + devel:libgeos$secondaryArchSuffix = $portVersion compat >= 3.7 + devel:libgeos_${portVersion}$secondaryArchSuffix = $portVersion compat >= 3.7 + devel:libgeos_c$secondaryArchSuffix = 1.11.2 compat >= 1 " REQUIRES_devel=" geos$secondaryArchSuffix == $portVersion base @@ -51,6 +51,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:which " BUILD() @@ -64,7 +65,7 @@ INSTALL() { make install - prepareInstalledDevelLibs libgeos_c libgeos libgeos-3.4.2 + prepareInstalledDevelLibs libgeos_c libgeos libgeos-$portVersion fixPkgconfig # devel package diff --git a/sci-libs/geos/patches/geos-3.4.2.patchset b/sci-libs/geos/patches/geos-3.4.2.patchset deleted file mode 100644 index 3f96d4860..000000000 --- a/sci-libs/geos/patches/geos-3.4.2.patchset +++ /dev/null @@ -1,36 +0,0 @@ -From cab618dc451bbf79c933ce6010082b6a16be2aba Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 22 Aug 2014 14:30:31 +0000 -Subject: haiku patch - - -diff --git a/configure.in b/configure.in -index 9522386..0b18abb 100644 ---- a/configure.in -+++ b/configure.in -@@ -196,7 +196,8 @@ dnl of isnan(). - - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for isnan], ac_cv_isnan, -- [AC_TRY_LINK([#include ], -+ [AC_TRY_LINK([#include -+#include ], - [double x; int y; y = 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 ab63929..613fa6a 100644 ---- a/include/geos/platform.h.in -+++ b/include/geos/platform.h.in -@@ -92,7 +92,7 @@ extern "C" - // sandro furieri: sanitizing MinGW32 - # define ISNAN(x) (std::isnan(x)) - # elif defined(__OSX__) || defined(__APPLE__) || \ -- defined(__NetBSD__) || defined(__DragonFly__) || \ -+ defined(__NetBSD__) || defined(__DragonFly__) || defined(__HAIKU__) || \ - (defined(__sun) && defined(__GNUC__)) - // Hack for OS/X incorrectly re-defining isnan() into oblivion. - // It does leave a version in std. --- -1.8.3.4 - diff --git a/sci-libs/geos/patches/geos-3.6.2.patchset b/sci-libs/geos/patches/geos-3.7.2.patchset similarity index 100% rename from sci-libs/geos/patches/geos-3.6.2.patchset rename to sci-libs/geos/patches/geos-3.7.2.patchset