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

Build against <json-c/...> includes and link against libjson-c.

Browse Source 
Also fix a typo in COMMENT and drop devel/json-c from BUILD_DEPENDS:
it's already in LIB_DEPENDS.  ok sthen@
This commit is contained in:
jca 2014-04-22 10:48:21 +00:00
parent 9bfea63984
commit a3fbf0b87b
5 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/droplet/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2013/03/21 08:45:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2014/04/22 10:48:21 jca Exp $
SHARED_ONLY= Yes
CATEGORIES= devel
COMMENT= high perfomance Cloud Storage client library
COMMENT= high performance Cloud Storage client library
VERSION= 1.1
REVISION= 0
REVISION= 1
DISTNAME= droplet-${VERSION}
HOMEPAGE= https://github.com/scality/Droplet
@ -17,7 +17,7 @@ MAINTAINER= Rafael Sadowski <rafael@sizeofvoid.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= crypto json m pthread ssl xml2 z
WANTLIB= crypto json-c m pthread ssl xml2 z
MASTER_SITES= http://www.sizeofvoid.org/pub/OpenBSD/distfiles/
@ -25,7 +25,6 @@ WRKDIST= ${WRKDIR}/scality-Droplet-e6692cc
MODULES= converters/libiconv
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/json-c \
devel/libtool
# XXX Depends on libtool macros

12
devel/droplet/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.1 2014/04/22 10:48:21 jca Exp $
--- configure.ac.orig Mon Apr 21 18:17:05 2014
+++ configure.ac Mon Apr 21 18:17:14 2014
@@ -27,7 +27,7 @@ AC_PROG_LN_S
PKG_CHECK_MODULES(LIBXML, libxml-2.0)
PKG_CHECK_MODULES(OPENSSL, openssl)
-PKG_CHECK_MODULES(JSON, json)
+PKG_CHECK_MODULES(JSON, json-c)
AC_SEARCH_LIBS([sqrt], [m], [], [AC_MSG_ERROR([libm library missing])])
AX_PTHREAD

12
devel/droplet/patches/patch-libdroplet_cdmi_replyparser_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libdroplet_cdmi_replyparser_c,v 1.1 2014/04/22 10:48:21 jca Exp $
--- libdroplet/cdmi/replyparser.c.orig Mon Apr 21 18:19:33 2014
+++ libdroplet/cdmi/replyparser.c Mon Apr 21 18:19:41 2014
@@ -32,7 +32,7 @@
* https://github.com/scality/Droplet
*/
#include "dropletp.h"
-#include <json/json.h>
+#include <json-c/json.h>
//#define DPRINTF(fmt,...) fprintf(stderr, fmt, ##__VA_ARGS__)
#define DPRINTF(fmt,...)

12
devel/droplet/patches/patch-libdroplet_include_dropletp_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libdroplet_include_dropletp_h,v 1.1 2014/04/22 10:48:21 jca Exp $
--- libdroplet/include/dropletp.h.orig Mon Apr 21 18:19:56 2014
+++ libdroplet/include/dropletp.h Mon Apr 21 18:20:05 2014
@@ -58,7 +58,7 @@
#include <openssl/rand.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <json/json.h>
+#include <json-c/json.h>
#include <sys/types.h>
#include <pwd.h>
#include <fcntl.h>

12
devel/droplet/patches/patch-libdroplet_srest_replyparser_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libdroplet_srest_replyparser_c,v 1.1 2014/04/22 10:48:21 jca Exp $
--- libdroplet/srest/replyparser.c.orig Mon Apr 21 18:20:17 2014
+++ libdroplet/srest/replyparser.c Mon Apr 21 18:20:22 2014
@@ -32,7 +32,7 @@
* https://github.com/scality/Droplet
*/
#include "dropletp.h"
-#include <json/json.h>
+#include <json-c/json.h>
//#define DPRINTF(fmt,...) fprintf(stderr, fmt, ##__VA_ARGS__)
#define DPRINTF(fmt,...)