On 2014/04/24 16:31, Christian Weisgerber wrote:
> Here's the list of ports that failed to build during the amd64
> package build started on 2014-04-22:
>
> databases/hs-HDBC-postgresql Missing C libraries: ssl, com_err
> databases/hs-postgresql-libpq Missing C libraries: ssl, asn1, krb5, ...
> geo/postgis json/json.h: No such file or directory
this should do the trick for postgis:
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/postgis/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 21 Apr 2014 15:20:06 -0000 1.21
+++ Makefile 24 Apr 2014 16:14:31 -0000
@@ -6,7 +6,7 @@ V = 2.1.0
COMMENT= geographic objects support for PostgreSQL
DISTNAME= postgis-${V}
CATEGORIES= geo databases
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://www.postgis.org/
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 24 Apr 2014 16:14:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Thu Apr 24 17:10:33 2014
++++ configure Thu Apr 24 17:10:54 2014
+@@ -18376,7 +18376,7 @@ fi
+
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$JSON_CPPFLAGS"
+-ac_fn_c_check_header_mongrel "$LINENO" "json/json.h"
"ac_cv_header_json_json_h" "$ac_includes_default"
++ac_fn_c_check_header_mongrel "$LINENO" "json-c/json.h"
"ac_cv_header_json_json_h" "$ac_includes_default"
+ if test "x$ac_cv_header_json_json_h" = x""yes; then :
+ HAVE_JSON=yes
+ fi
Index: patches/patch-liblwgeom_lwin_geojson_c
===================================================================
RCS file: patches/patch-liblwgeom_lwin_geojson_c
diff -N patches/patch-liblwgeom_lwin_geojson_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-liblwgeom_lwin_geojson_c 24 Apr 2014 16:14:31 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- liblwgeom/lwin_geojson.c.orig Thu Apr 24 17:11:05 2014
++++ liblwgeom/lwin_geojson.c Thu Apr 24 17:12:01 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)
+@@ -512,7 +512,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);
