cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to postgis 2.1.5.

Browse Source 
See http://svn.osgeo.org/postgis/tags/2.1.5/NEWS for changes, regress
tests still all pass on amd64.
This commit is contained in:
landry 2014-12-19 20:34:58 +00:00
parent fef5403543
commit ababf521f9
4 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geo/postgis/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2014/09/02 12:07:46 landry Exp $
# $OpenBSD: Makefile,v 1.23 2014/12/19 20:34:58 landry Exp $
SHARED_ONLY= Yes
V = 2.1.3
V = 2.1.5
COMMENT= geographic objects support for PostgreSQL
DISTNAME= postgis-${V}
CATEGORIES= geo databases
@ -20,7 +20,7 @@ WANTLIB= c geos_c m pq>=5.3 proj xml2 z
WANTLIB += curl expat gdal geos geotiff gif idn
WANTLIB += jasper jpeg json-c png pthread ssl stdc++ tiff
WANTLIB += freexl pcre spatialite sqlite3
WANTLIB += crypto openjp2
WANTLIB += crypto openjp2 lzma
MODULES = devel/gettext

4
geo/postgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (postgis-2.1.3.tar.gz) = wXgSqku4btVh38ZctCq0UXa5TgYg3hg6S713PW2HbsE=
SIZE (postgis-2.1.3.tar.gz) = 6881881
SHA256 (postgis-2.1.5.tar.gz) = DQ4n9y8SuNukVvveJe0PaRP0K69XMyp/G5u8byn92/Q=
SIZE (postgis-2.1.5.tar.gz) = 6827999

39
geo/postgis/patches/patch-liblwgeom_lwin_geojson_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-liblwgeom_lwin_geojson_c,v 1.2 2014/09/02 12:07:46 landry Exp $
json_tokener.h had this at some point, then it got completely removed..
/**
* @b XXX do not use json_tokener_errors directly.
* After v0.10 this will be removed.
*
* See json_tokener_error_desc() instead.
*/
extern const char* json_tokener_errors[];
commit f9136f68520db4761f05810f97922900ba459f46
Author: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sat Mar 22 21:41:24 2014 -0400
Make the json_tokener_errors array local. It has been deprecated for a while, and json_tokener_error_desc() should be used instead.
--- liblwgeom/lwin_geojson.c.orig Thu Apr 3 23:53:20 2014
+++ liblwgeom/lwin_geojson.c Tue Sep 2 13:35:28 2014
@@ -17,8 +17,8 @@
#ifdef HAVE_LIBJSON
-#include <json/json.h>
-#include <json/json_object_private.h>
+#include <json-c/json.h>
+#include <json-c/json_object_private.h>
#include <string.h>
static void geojson_lwerror(char *msg, int error_code)
@@ -510,7 +510,7 @@ lwgeom_from_geojson(const char *geojson, char **srs)
if( jstok->err != json_tokener_success)
{
char err[256];
- snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset);
+ snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
json_object_put(poObj);
geojson_lwerror(err, 1);

8
geo/postgis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2014/09/02 12:07:46 landry Exp $
@comment $OpenBSD: PLIST,v 1.10 2014/12/19 20:34:58 landry Exp $
@bin bin/pgsql2shp
@bin bin/raster2pgsql
@bin bin/shp2pgsql
@ -221,6 +221,8 @@ share/postgresql/extension/postgis--2.1.0rc2--${V}.sql
share/postgresql/extension/postgis--2.1.0rc3--${V}.sql
share/postgresql/extension/postgis--2.1.1--${V}.sql
share/postgresql/extension/postgis--2.1.2--${V}.sql
share/postgresql/extension/postgis--2.1.3--${V}.sql
share/postgresql/extension/postgis--2.1.4--${V}.sql
share/postgresql/extension/postgis--${V}--${V}next.sql
share/postgresql/extension/postgis--${V}.sql
share/postgresql/extension/postgis--${V}next--${V}.sql
@ -238,6 +240,8 @@ share/postgresql/extension/postgis_tiger_geocoder--2.1.0rc2--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.1.0rc3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.1.1--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.1.2--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.1.3--${V}.sql
share/postgresql/extension/postgis_tiger_geocoder--2.1.4--${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}next--${V}.sql
@ -255,6 +259,8 @@ share/postgresql/extension/postgis_topology--2.1.0rc2--${V}.sql
share/postgresql/extension/postgis_topology--2.1.0rc3--${V}.sql
share/postgresql/extension/postgis_topology--2.1.1--${V}.sql
share/postgresql/extension/postgis_topology--2.1.2--${V}.sql
share/postgresql/extension/postgis_topology--2.1.3--${V}.sql
share/postgresql/extension/postgis_topology--2.1.4--${V}.sql
share/postgresql/extension/postgis_topology--${V}--${V}next.sql
share/postgresql/extension/postgis_topology--${V}.sql
share/postgresql/extension/postgis_topology--${V}next--${V}.sql