From f0530a76e33f5ec908fe7f6a1350e77c682f6859 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Mon, 28 Feb 2022 17:33:09 +0800 Subject: [PATCH] graphics/geos: Update to 3.9.2 Changes: https://github.com/libgeos/geos/blob/3.9/NEWS --- graphics/geos/Makefile | 2 +- graphics/geos/distinfo | 6 +++--- graphics/geos/files/patch-tests-geostest-Makefile.in | 5 ++--- graphics/geos/files/patch-tests-thread-Makefile.in | 6 ++---- graphics/geos/pkg-plist | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index 612b214d75f7..a48356dc805b 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -1,7 +1,7 @@ # Created by: Leonardo Martins PORTNAME= geos -PORTVERSION= 3.9.1 +PORTVERSION= 3.9.2 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/geos/ \ LOCAL/sunpoet diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo index 42c1ca6e3eb7..d9a49414a183 100644 --- a/graphics/geos/distinfo +++ b/graphics/geos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613478315 -SHA256 (geos-3.9.1.tar.bz2) = 7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a -SIZE (geos-3.9.1.tar.bz2) = 4761372 +TIMESTAMP = 1643970986 +SHA256 (geos-3.9.2.tar.bz2) = 44a5a9be21d7d473436bf621c2ddcc3cf5a8bbe3c786e13229618a3b9d861297 +SIZE (geos-3.9.2.tar.bz2) = 4775911 diff --git a/graphics/geos/files/patch-tests-geostest-Makefile.in b/graphics/geos/files/patch-tests-geostest-Makefile.in index 2844d869e623..d70e2d84a21c 100644 --- a/graphics/geos/files/patch-tests-geostest-Makefile.in +++ b/graphics/geos/files/patch-tests-geostest-Makefile.in @@ -1,11 +1,10 @@ ---- tests/geostest/Makefile.in.orig 2020-12-09 19:04:24 UTC +--- tests/geostest/Makefile.in.orig 2021-11-01 18:12:44 UTC +++ tests/geostest/Makefile.in -@@ -319,9 +319,9 @@ EXTRA_DIST = \ +@@ -332,9 +332,8 @@ EXTRA_DIST = \ testrunner.sh -# The -lstdc++ is needed for --disable-shared to work -+# The is needed for --disable-shared to work geostest_SOURCES = geostest.c -geostest_LDADD = $(top_builddir)/capi/libgeos_c.la -lstdc++ +geostest_LDADD = $(top_builddir)/capi/libgeos_c.la diff --git a/graphics/geos/files/patch-tests-thread-Makefile.in b/graphics/geos/files/patch-tests-thread-Makefile.in index 22ffc7a0b375..7799467bd025 100644 --- a/graphics/geos/files/patch-tests-thread-Makefile.in +++ b/graphics/geos/files/patch-tests-thread-Makefile.in @@ -1,17 +1,15 @@ ---- tests/thread/Makefile.in.orig 2020-12-09 19:04:24 UTC +--- tests/thread/Makefile.in.orig 2021-11-01 18:12:44 UTC +++ tests/thread/Makefile.in -@@ -316,13 +316,13 @@ top_srcdir = @top_srcdir@ +@@ -330,13 +330,11 @@ top_srcdir = @top_srcdir@ # AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi -# The -lstdc++ is needed for --disable-shared to work -+# The is needed for --disable-shared to work threadtest_SOURCES = threadtest.c -threadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++ +threadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -# The -lstdc++ is needed for --disable-shared to work -+# The is needed for --disable-shared to work badthreadtest_SOURCES = badthreadtest.c -badthreadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++ +badthreadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist index 140c836a94c4..561db21f75c9 100644 --- a/graphics/geos/pkg-plist +++ b/graphics/geos/pkg-plist @@ -434,5 +434,5 @@ lib/libgeos.so lib/libgeos_c.a lib/libgeos_c.so lib/libgeos_c.so.1 -lib/libgeos_c.so.1.14.2 +lib/libgeos_c.so.1.14.3 libdata/pkgconfig/geos.pc