From owner-svn-ports-all@freebsd.org  Sun Aug 27 00:36:49 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 AD21ADDEC4F;
 Sun, 27 Aug 2017 00:36:49 +0000 (UTC)
 (envelope-from sunpoet@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 7866B8210D;
 Sun, 27 Aug 2017 00:36:49 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7R0am19050865;
 Sun, 27 Aug 2017 00:36:48 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7R0aml9050864;
 Sun, 27 Aug 2017 00:36:48 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201708270036.v7R0aml9050864@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 27 Aug 2017 00:36:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r448795 - head/textproc/rubygem-gitlab-linguist
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: head/textproc/rubygem-gitlab-linguist
X-SVN-Commit-Revision: 448795
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: Sun, 27 Aug 2017 00:36:49 -0000

Author: sunpoet
Date: Sun Aug 27 00:36:48 2017
New Revision: 448795
URL: https://svnweb.freebsd.org/changeset/ports/448795

Log:
  Mark CONFLICTS_INSTALL with rubygem-github-linguist

Modified:
  head/textproc/rubygem-gitlab-linguist/Makefile

Modified: head/textproc/rubygem-gitlab-linguist/Makefile
==============================================================================
--- head/textproc/rubygem-gitlab-linguist/Makefile	Sun Aug 27 00:36:43 2017	(r448794)
+++ head/textproc/rubygem-gitlab-linguist/Makefile	Sun Aug 27 00:36:48 2017	(r448795)
@@ -14,6 +14,9 @@ RUN_DEPENDS=	rubygem-charlock_holmes>=0.6.6:textproc/r
 		rubygem-escape_utils-rails4>=0.2.4:textproc/rubygem-escape_utils-rails4 \
 		rubygem-mime-types1>=1.19:misc/rubygem-mime-types1
 
+# bin/linguist
+CONFLICTS_INSTALL=	rubygem-github-linguist
+
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem