From 6abb9fe776dbe77b80511774218b4e16b881a462 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Wed, 20 Aug 2014 15:59:09 +0000 Subject: [PATCH] Fix build after json-c update. rsyslog8-devel fails to build against the new json-c, so I've marked it BROKEN. --- sysutils/rsyslog7-devel/Makefile | 2 +- .../rsyslog7-devel/files/patch-runtime__lookup.c | 13 +++++++++++++ sysutils/rsyslog7/Makefile | 2 +- sysutils/rsyslog8-devel/Makefile | 4 +++- sysutils/rsyslog8/Makefile | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 sysutils/rsyslog7-devel/files/patch-runtime__lookup.c diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile index 3beecf84fe69..7dc19909f99d 100644 --- a/sysutils/rsyslog7-devel/Makefile +++ b/sysutils/rsyslog7-devel/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ - libjson.so:${PORTSDIR}/devel/json-c \ + libjson-c.so:${PORTSDIR}/devel/json-c \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid USE_LDCONFIG= yes diff --git a/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c b/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c new file mode 100644 index 000000000000..530996d60b0a --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c @@ -0,0 +1,13 @@ +--- ./runtime/lookup.c.orig 2014-08-20 11:50:14.000000000 -0400 ++++ ./runtime/lookup.c 2014-08-20 11:52:52.000000000 -0400 +@@ -26,8 +26,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + + #include "rsyslog.h" diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile index b25054a3fdcc..d4bfaa1a2df3 100644 --- a/sysutils/rsyslog7/Makefile +++ b/sysutils/rsyslog7/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ - libjson.so:${PORTSDIR}/devel/json-c \ + libjson-c.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging USE_LDCONFIG= yes diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile index 8f3e8e62d2d2..ab24902b00be 100644 --- a/sysutils/rsyslog8-devel/Makefile +++ b/sysutils/rsyslog8-devel/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ - libjson.so:${PORTSDIR}/devel/json-c \ + libjson-c.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid @@ -36,6 +36,8 @@ SNMP_DESC= SNMP trap sender for rsyslog USES= libtool pkgconfig +BROKEN= fails to build with new json-c + .include .if ${PORT_OPTIONS:MDBI} diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 72872434f65f..2d282addb05e 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ - libjson.so:${PORTSDIR}/devel/json-c \ + libjson-c.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid