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

Fix build after json-c update.

Browse Source
This commit is contained in:
Adam Weinberger 2014-08-20 15:46:05 +00:00
parent dea396af63
commit 123425fce5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365471
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/grive/Makefile
View File

@ -15,7 +15,7 @@ LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
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

11
net/grive/files/patch-cmake__Modules__FindJSONC.cmake Normal file
View File

@ -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)

13
net/grive/files/patch-libgrive__src__protocol__Json.cc Normal file
View File

@ -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