databases/postgis21: Upgrade version 2.1.0 => 2.1.3

This unbreaks the port after the json-c dependency update.
While here, using modern options framework

PR:		192840
Submitted by;	Luca Corti
Patch by:	Muhammad Rahman

1 files changed, 22 insertions, 0 deletions

diff --git a/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c b/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c
new file mode 100644
index 000000000000..c789416310b4
--- /dev/null
+++ b/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c
@@ -0,0 +1,22 @@
+--- liblwgeom/lwin_geojson.c.orig	2014-08-20 10:32:15.721407424 +0600
++++ liblwgeom/lwin_geojson.c	2014-08-20 10:32:44.823412267 +0600
+@@ -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 @@
+ 	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);