svn commit: r451270 - in head/sysutils: syslog-ng310 syslog-ng311 syslog-ng37 syslog-ng39

[Cy Schubert]

Author: cy
Date: Thu Oct  5 06:22:29 2017
New Revision: 451270
URL: https://svnweb.freebsd.org/changeset/ports/451270

Log:
  Register conflict with syslog-ng-incubator.
  
  Reported by:	rodrigo

Modified:
  head/sysutils/syslog-ng310/Makefile   (contents, props changed)
  head/sysutils/syslog-ng311/Makefile   (contents, props changed)
  head/sysutils/syslog-ng37/Makefile   (contents, props changed)
  head/sysutils/syslog-ng39/Makefile   (contents, props changed)

Modified: head/sysutils/syslog-ng310/Makefile
==============================================================================
--- head/sysutils/syslog-ng310/Makefile	Thu Oct  5 06:22:25 2017	(r451269)
+++ head/sysutils/syslog-ng310/Makefile	Thu Oct  5 06:22:29 2017	(r451270)
@@ -24,7 +24,9 @@ BROKEN_sparc64=		fails to link: Internal error: Segmen
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]*
+		syslog-ng-devel-[0-9]* \
+		syslog-ng-incubator-*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes

Modified: head/sysutils/syslog-ng311/Makefile
==============================================================================
--- head/sysutils/syslog-ng311/Makefile	Thu Oct  5 06:22:25 2017	(r451269)
+++ head/sysutils/syslog-ng311/Makefile	Thu Oct  5 06:22:29 2017	(r451270)
@@ -23,7 +23,9 @@ BROKEN_sparc64=		fails to link: Internal error: Segmen
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]* eventlog*
+		syslog-ng-devel-[0-9]* eventlog* \
+		syslog-ng-incubator-*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes

Modified: head/sysutils/syslog-ng37/Makefile
==============================================================================
--- head/sysutils/syslog-ng37/Makefile	Thu Oct  5 06:22:25 2017	(r451269)
+++ head/sysutils/syslog-ng37/Makefile	Thu Oct  5 06:22:29 2017	(r451270)
@@ -27,7 +27,9 @@ BROKEN_sparc64=		fails to link: Internal error: Segmen
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng[0-9][0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]*
+		syslog-ng-devel-[0-9]* \
+		syslog-ng-incubator-*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes

Modified: head/sysutils/syslog-ng39/Makefile
==============================================================================
--- head/sysutils/syslog-ng39/Makefile	Thu Oct  5 06:22:25 2017	(r451269)
+++ head/sysutils/syslog-ng39/Makefile	Thu Oct  5 06:22:29 2017	(r451270)
@@ -25,7 +25,9 @@ BROKEN_sparc64=		fails to link: Internal error: Segmen
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng[0-9][0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]*
+		syslog-ng-devel-[0-9]* \
+		syslog-ng-incubator-*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes