From owner-svn-ports-all@freebsd.org Thu Oct 5 06:22:31 2017 Return-Path: Delivered-To: svn-ports-all@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 4673FE2DE10; Thu, 5 Oct 2017 06:22:31 +0000 (UTC) (envelope-from cy@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 1FC671D07; Thu, 5 Oct 2017 06:22:31 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v956MUrl086790; Thu, 5 Oct 2017 06:22:30 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v956MTce086786; Thu, 5 Oct 2017 06:22:29 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201710050622.v956MTce086786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 5 Oct 2017 06:22:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451270 - in head/sysutils: syslog-ng310 syslog-ng311 syslog-ng37 syslog-ng39 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/sysutils: syslog-ng310 syslog-ng311 syslog-ng37 syslog-ng39 X-SVN-Commit-Revision: 451270 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Oct 2017 06:22:31 -0000 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