From owner-svn-ports-all@freebsd.org  Wed Aug  9 09:01:40 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 9D77CDC7731;
 Wed,  9 Aug 2017 09:01:40 +0000 (UTC) (envelope-from tz@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 6D1E7692F6;
 Wed,  9 Aug 2017 09:01:40 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7991dBa004449;
 Wed, 9 Aug 2017 09:01:39 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7991d5a004448;
 Wed, 9 Aug 2017 09:01:39 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201708090901.v7991d5a004448@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Wed, 9 Aug 2017 09:01:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r447606 - head/devel/rubygem-grape0
X-SVN-Group: ports-head
X-SVN-Commit-Author: tz
X-SVN-Commit-Paths: head/devel/rubygem-grape0
X-SVN-Commit-Revision: 447606
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Aug 2017 09:01:40 -0000

Author: tz
Date: Wed Aug  9 09:01:39 2017
New Revision: 447606
URL: https://svnweb.freebsd.org/changeset/ports/447606

Log:
  devel/rubygem-grape0: Register conflict with devel/rubygem-grape
  
  Submitted by: Matthias Fechner <idefix@fechner.net>

Modified:
  head/devel/rubygem-grape0/Makefile

Modified: head/devel/rubygem-grape0/Makefile
==============================================================================
--- head/devel/rubygem-grape0/Makefile	Wed Aug  9 09:01:19 2017	(r447605)
+++ head/devel/rubygem-grape0/Makefile	Wed Aug  9 09:01:39 2017	(r447606)
@@ -22,6 +22,7 @@ RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-a
 		rubygem-rack-accept>=0:www/rubygem-rack-accept \
 		rubygem-virtus>=1.0.0:devel/rubygem-virtus
 
+CONFLICTS=	rubygem-grape
 PORTSCOUT=	limit:^0\.
 
 NO_ARCH=	yes