From 38bdd1263c1c69eed3bb35f732827007ac398f4f Mon Sep 17 00:00:00 2001 From: marino Date: Wed, 20 Aug 2014 18:11:00 +0000 Subject: security/razorback-dispatcher: Chase json-c update (Unbreak) --- security/razorback-dispatcher/Makefile | 4 +++- .../razorback-dispatcher/files/patch-common__m4_api__deps.m4 | 11 +++++++++++ .../files/patch-common__m4_compiler__options.m4 | 11 +++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 security/razorback-dispatcher/files/patch-common__m4_api__deps.m4 create mode 100644 security/razorback-dispatcher/files/patch-common__m4_compiler__options.m4 (limited to 'security') diff --git a/security/razorback-dispatcher/Makefile b/security/razorback-dispatcher/Makefile index f4bce75db323..665e5f87c8ea 100644 --- a/security/razorback-dispatcher/Makefile +++ b/security/razorback-dispatcher/Makefile @@ -3,7 +3,7 @@ PORTNAME= dispatcher PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Dispatcher PKGNAMEPREFIX= razorback- @@ -16,11 +16,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= librazorback_api.so:${PORTSDIR}/security/razorback-api \ + libjson-c.so:${PORTSDIR}/devel/json-c \ libmemcached.so:${PORTSDIR}/databases/libmemcached \ libcli.so:${PORTSDIR}/devel/libcli USES= libtool pathfix pkgconfig GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf USE_MYSQL= yes USE_RC_SUBR= dispatcher dispatcher_safed SUB_FILES= pkg-message diff --git a/security/razorback-dispatcher/files/patch-common__m4_api__deps.m4 b/security/razorback-dispatcher/files/patch-common__m4_api__deps.m4 new file mode 100644 index 000000000000..b424f894f261 --- /dev/null +++ b/security/razorback-dispatcher/files/patch-common__m4_api__deps.m4 @@ -0,0 +1,11 @@ +--- common_m4/api_deps.m4.orig 2012-04-16 18:59:44 UTC ++++ common_m4/api_deps.m4 +@@ -55,7 +55,7 @@ LIBS="$LIBCONFIG_LIBS $LIBS" + # [AC_MSG_ERROR("curl header file not found")] + # ) + +-PKG_CHECK_MODULES([JSON], [json >= 0.9]) ++PKG_CHECK_MODULES([JSON], [json-c >= 0.9]) + + CFLAGS="$JSON_CFLAGS $CFLAGS" + LIBS="$JSON_LIBS $LIBS" diff --git a/security/razorback-dispatcher/files/patch-common__m4_compiler__options.m4 b/security/razorback-dispatcher/files/patch-common__m4_compiler__options.m4 new file mode 100644 index 000000000000..8e2572727b90 --- /dev/null +++ b/security/razorback-dispatcher/files/patch-common__m4_compiler__options.m4 @@ -0,0 +1,11 @@ +--- common_m4/compiler_options.m4.orig 2012-01-04 18:17:09 UTC ++++ common_m4/compiler_options.m4 +@@ -28,7 +28,7 @@ if test "$GCC" = yes ; then + + CFLAGS="$CFLAGS -std=c99 -fno-strict-aliasing" + CPPFLAGS="$CPPFLAGS -fno-strict-aliasing" +- CWARNINGS="$CWARNINGS -Wall -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wformat-security -Wsign-compare -Wcast-align -Wno-unused-parameter" ++ CWARNINGS="$CWARNINGS -Wall -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wformat-security -Wsign-compare -Wcast-align -Wno-unused-parameter" + if test "x$NOT_PEDANTIC" = "x"; then + CWARNINGS="$CWARNINGS -pedantic" + fi -- cgit