Update to postgis 2.4.4.

This commit is contained in:
landry 2018-04-11 07:41:45 +00:00
parent 2f1a2dd49b
commit 0c18dc9717
4 changed files with 17 additions and 33 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.45 2018/02/25 09:47:03 landry Exp $
# $OpenBSD: Makefile,v 1.46 2018/04/11 07:41:45 landry Exp $
V = 2.4.3
V = 2.4.4
COMMENT= geographic objects support for PostgreSQL
DISTNAME= postgis-${V}
CATEGORIES= geo databases

View File

@ -1,2 +1,2 @@
SHA256 (postgis-2.4.3.tar.gz) = 6lN0xdtrZFulYo3csI9x07PZCkZNNmtOHSDVomi95Lk=
SIZE (postgis-2.4.3.tar.gz) = 12601055
SHA256 (postgis-2.4.4.tar.gz) = BmPvtYkhDVBI2VyBflzylVLsgYDhbUxu9WyUJV+sqMI=
SIZE (postgis-2.4.4.tar.gz) = 12608016

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-liblwgeom_lwin_geojson_c,v 1.4 2018/02/11 15:17:16 landry Exp $
Fix build with json-c 0.13
https://github.com/postgis/postgis/pull/173
Index: liblwgeom/lwin_geojson.c
--- liblwgeom/lwin_geojson.c.orig
+++ liblwgeom/lwin_geojson.c
@@ -31,12 +31,18 @@
#if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */
+#define JSON_C_VERSION_013 (13 << 8)
+
#ifdef HAVE_LIBJSON_C
#include <json-c/json.h>
-#include <json-c/json_object_private.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
+#include <json-c/json_object_private.h>
+#endif
#else
#include <json/json.h>
+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013
#include <json/json_object_private.h>
+#endif
#endif
#ifndef JSON_C_VERSION

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2018/02/25 09:47:03 landry Exp $
@comment $OpenBSD: PLIST,v 1.23 2018/04/11 07:41:45 landry Exp $
@bin bin/pgsql2shp
@bin bin/raster2pgsql
@bin bin/shp2pgsql
@ -289,6 +289,7 @@ share/postgresql/extension/postgis--2.2.3--${V}.sql
share/postgresql/extension/postgis--2.2.4--${V}.sql
share/postgresql/extension/postgis--2.2.5--${V}.sql
share/postgresql/extension/postgis--2.2.6--${V}.sql
share/postgresql/extension/postgis--2.2.7--${V}.sql
share/postgresql/extension/postgis--2.3.0--${V}.sql
share/postgresql/extension/postgis--2.3.1--${V}.sql
share/postgresql/extension/postgis--2.3.2--${V}.sql
@ -296,11 +297,14 @@ share/postgresql/extension/postgis--2.3.3--${V}.sql
share/postgresql/extension/postgis--2.3.4--${V}.sql
share/postgresql/extension/postgis--2.3.5--${V}.sql
share/postgresql/extension/postgis--2.3.6--${V}.sql
share/postgresql/extension/postgis--2.3.7--${V}.sql
share/postgresql/extension/postgis--2.4.0--${V}.sql
share/postgresql/extension/postgis--2.4.1--${V}.sql
share/postgresql/extension/postgis--2.4.2--${V}.sql
share/postgresql/extension/postgis--2.4.3--${V}.sql
share/postgresql/extension/postgis--${V}--${V}next.sql
share/postgresql/extension/postgis--${V}.sql
share/postgresql/extension/postgis--${V}dev--${V}.sql
share/postgresql/extension/postgis--${V}next--${V}.sql
share/postgresql/extension/postgis--unpackaged--${V}.sql
share/postgresql/extension/postgis.control
@ -329,6 +333,7 @@ share/postgresql/extension/postgis_tiger_geocoder--2.2.3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.2.4--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.2.5--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.2.6--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.2.7--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.0--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.1--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.2--${V}.sql
@ -336,11 +341,14 @@ share/postgresql/extension/postgis_tiger_geocoder--2.3.3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.4--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.5--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.6--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.3.7--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.4.0--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.4.1--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.4.2--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.4.3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}--${V}next.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}dev--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--${V}next--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--unpackaged--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder.control
@ -370,6 +378,7 @@ share/postgresql/extension/postgis_topology--2.2.3--${V}.sql
share/postgresql/extension/postgis_topology--2.2.4--${V}.sql
share/postgresql/extension/postgis_topology--2.2.5--${V}.sql
share/postgresql/extension/postgis_topology--2.2.6--${V}.sql
share/postgresql/extension/postgis_topology--2.2.7--${V}.sql
share/postgresql/extension/postgis_topology--2.3.0--${V}.sql
share/postgresql/extension/postgis_topology--2.3.1--${V}.sql
share/postgresql/extension/postgis_topology--2.3.2--${V}.sql
@ -377,11 +386,14 @@ share/postgresql/extension/postgis_topology--2.3.3--${V}.sql
share/postgresql/extension/postgis_topology--2.3.4--${V}.sql
share/postgresql/extension/postgis_topology--2.3.5--${V}.sql
share/postgresql/extension/postgis_topology--2.3.6--${V}.sql
share/postgresql/extension/postgis_topology--2.3.7--${V}.sql
share/postgresql/extension/postgis_topology--2.4.0--${V}.sql
share/postgresql/extension/postgis_topology--2.4.1--${V}.sql
share/postgresql/extension/postgis_topology--2.4.2--${V}.sql
share/postgresql/extension/postgis_topology--2.4.3--${V}.sql
share/postgresql/extension/postgis_topology--${V}--${V}next.sql
share/postgresql/extension/postgis_topology--${V}.sql
share/postgresql/extension/postgis_topology--${V}dev--${V}.sql
share/postgresql/extension/postgis_topology--${V}next--${V}.sql
share/postgresql/extension/postgis_topology--unpackaged--${V}.sql
share/postgresql/extension/postgis_topology.control