svn commit: r444784 - head/sysutils/rsyslog8

[Matthew Seaman]

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 at 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