svn commit: r365473 - in head/sysutils: rsyslog7 rsyslog7-devel rsyslog7-devel/files rsyslog8 rsyslog8-devel

[Adam Weinberger]

Author: adamw
Date: Wed Aug 20 15:59:09 2014
New Revision: 365473
URL: http://svnweb.freebsd.org/changeset/ports/365473
QAT: https://qat.redports.org/buildarchive/r365473/

Log:
  Fix build after json-c update.
  
  rsyslog8-devel fails to build against the new json-c, so I've marked it
  BROKEN.

Added:
  head/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c   (contents, props changed)
Modified:
  head/sysutils/rsyslog7-devel/Makefile
  head/sysutils/rsyslog7/Makefile
  head/sysutils/rsyslog8-devel/Makefile
  head/sysutils/rsyslog8/Makefile

Modified: head/sysutils/rsyslog7-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog7-devel/Makefile	Wed Aug 20 15:54:03 2014	(r365472)
+++ head/sysutils/rsyslog7-devel/Makefile	Wed Aug 20 15:59:09 2014	(r365473)
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
 
 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

Added: head/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c	Wed Aug 20 15:59:09 2014	(r365473)
@@ -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 <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-#include <json/json.h>
+-#include <json/json.h>
++#include <json-c/json.h>
++#include <json-c/json.h>
+ #include <assert.h>
+ 
+ #include "rsyslog.h"

Modified: head/sysutils/rsyslog7/Makefile
==============================================================================
--- head/sysutils/rsyslog7/Makefile	Wed Aug 20 15:54:03 2014	(r365472)
+++ head/sysutils/rsyslog7/Makefile	Wed Aug 20 15:59:09 2014	(r365473)
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
 
 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

Modified: head/sysutils/rsyslog8-devel/Makefile
==============================================================================
--- head/sysutils/rsyslog8-devel/Makefile	Wed Aug 20 15:54:03 2014	(r365472)
+++ head/sysutils/rsyslog8-devel/Makefile	Wed Aug 20 15:59:09 2014	(r365473)
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
 
 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 <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}

Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile	Wed Aug 20 15:54:03 2014	(r365472)
+++ head/sysutils/rsyslog8/Makefile	Wed Aug 20 15:59:09 2014	(r365473)
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
 
 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