From owner-svn-ports-head@FreeBSD.ORG Wed Aug 20 15:59:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68512604; Wed, 20 Aug 2014 15:59:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 530C3305F; Wed, 20 Aug 2014 15:59:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KFxBj3075354; Wed, 20 Aug 2014 15:59:11 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KFxAqA075349; Wed, 20 Aug 2014 15:59:10 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201408201559.s7KFxAqA075349@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Wed, 20 Aug 2014 15:59:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365473 - in head/sysutils: rsyslog7 rsyslog7-devel rsyslog7-devel/files rsyslog8 rsyslog8-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2014 15:59:11 -0000 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 + #include + #include +-#include +-#include ++#include ++#include + #include + + #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 .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