From owner-svn-ports-head@freebsd.org  Fri Jun 30 22:02:25 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12548D9BAA6;
 Fri, 30 Jun 2017 22:02:25 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D59487E988;
 Fri, 30 Jun 2017 22:02:24 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5UM2O5r042763;
 Fri, 30 Jun 2017 22:02:24 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5UM2OBR042762;
 Fri, 30 Jun 2017 22:02:24 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201706302202.v5UM2OBR042762@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Fri, 30 Jun 2017 22:02:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r444784 - head/sysutils/rsyslog8
X-SVN-Group: ports-head
X-SVN-Commit-Author: matthew
X-SVN-Commit-Paths: head/sysutils/rsyslog8
X-SVN-Commit-Revision: 444784
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jun 2017 22:02:25 -0000

Author: matthew
Date: Fri Jun 30 22:02:23 2017
New Revision: 444784
URL: https://svnweb.freebsd.org/changeset/ports/444784

Log:
  rsyslog cannot use the Inotify emulation provided by the
  devel/libinotify port -- the kqueue based emulation does not persist
  over forking, unlike the genuine linux inotify.
  
  However, the presence of certain header files will cause rsyslog to
  attempt to unconditionally compile in Inotify support, and this breaks
  the build.
  
  Use CONFLICTS_BUILD to mark the incompatibility.
  
  PR:		220376
  Submitted by:	dewayne@heuristicsystems.com.au

Modified:
  head/sysutils/rsyslog8/Makefile

Modified: head/sysutils/rsyslog8/Makefile
==============================================================================
--- head/sysutils/rsyslog8/Makefile	Fri Jun 30 21:12:59 2017	(r444783)
+++ head/sysutils/rsyslog8/Makefile	Fri Jun 30 22:02:23 2017	(r444784)
@@ -22,6 +22,8 @@ PORTSCOUT=	limit:^8\.
 
 USE_LDCONFIG=	yes
 
+CONFLICTS_BUILD=	libinotify-*
+
 OPTIONS_DEFINE=	DBI DOCS ELASTIC GCRYPT GNUTLS GSSAPI JSONPARSE  MYSQL PGSQL \
 		RELP SNMP NORMALIZE
 OPTIONS_DEFAULT=GCRYPT