svn commit: r365471 - in head/net/grive: . files

[Adam Weinberger]

Author: adamw
Date: Wed Aug 20 15:46:05 2014
New Revision: 365471
URL: http://svnweb.freebsd.org/changeset/ports/365471
QAT: https://qat.redports.org/buildarchive/r365471/

Log:
  Fix build after json-c update.

Added:
  head/net/grive/files/patch-cmake__Modules__FindJSONC.cmake   (contents, props changed)
  head/net/grive/files/patch-libgrive__src__protocol__Json.cc   (contents, props changed)
Modified:
  head/net/grive/Makefile

Modified: head/net/grive/Makefile
==============================================================================
--- head/net/grive/Makefile	Wed Aug 20 15:39:50 2014	(r365470)
+++ head/net/grive/Makefile	Wed Aug 20 15:46:05 2014	(r365471)
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libboost_filesystem.so:${PO
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libjson.so:${PORTSDIR}/devel/json-c \
+		libjson-c.so:${PORTSDIR}/devel/json-c \
 		libyajl.so:${PORTSDIR}/devel/yajl
 
 USE_GITHUB=	yes

Added: head/net/grive/files/patch-cmake__Modules__FindJSONC.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/grive/files/patch-cmake__Modules__FindJSONC.cmake	Wed Aug 20 15:46:05 2014	(r365471)
@@ -0,0 +1,11 @@
+--- ./cmake/Modules/FindJSONC.cmake.orig	2014-08-20 11:43:11.000000000 -0400
++++ ./cmake/Modules/FindJSONC.cmake	2014-08-20 11:43:25.000000000 -0400
+@@ -6,7 +6,7 @@
+ #  JSONC_INCLUDE_DIR - The JSON-C include directory.
+ #  JSONC_LIBRARY     - The JSON-C library to link against.
+ 
+-FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
++FIND_PATH(JSONC_INCLUDE_DIR json-c/json.h)
+ FIND_LIBRARY(JSONC_LIBRARY NAMES json)
+ 
+ IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)

Added: head/net/grive/files/patch-libgrive__src__protocol__Json.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/grive/files/patch-libgrive__src__protocol__Json.cc	Wed Aug 20 15:46:05 2014	(r365471)
@@ -0,0 +1,13 @@
+--- ./libgrive/src/protocol/Json.cc.orig	2014-08-20 11:44:51.000000000 -0400
++++ ./libgrive/src/protocol/Json.cc	2014-08-20 11:45:03.000000000 -0400
+@@ -29,8 +29,8 @@
+ 	#pragma warning(push)
+ 	#pragma warning(disable: 4005)
+ #endif
+-#include <json/json_tokener.h>
+-#include <json/linkhash.h>
++#include <json-c/json_tokener.h>
++#include <json-c/linkhash.h>
+ #ifdef _MSC_VER
+ 	#pragma warning(pop)
+ #endif