From owner-svn-ports-all@freebsd.org  Sat Feb 17 17:51:29 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BA51F23C91;
 Sat, 17 Feb 2018 17:51:29 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F3738B7B5;
 Sat, 17 Feb 2018 17:51:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA6F620006;
 Sat, 17 Feb 2018 17:51:25 +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 w1HHpPf9061629;
 Sat, 17 Feb 2018 17:51:25 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1HHpPRM061628;
 Sat, 17 Feb 2018 17:51:25 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201802171751.w1HHpPRM061628@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: Sat, 17 Feb 2018 17:51:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r462180 - 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: 462180
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.25
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: Sat, 17 Feb 2018 17:51:29 -0000

Author: sunpoet
Date: Sat Feb 17 17:51:25 2018
New Revision: 462180
URL: https://svnweb.freebsd.org/changeset/ports/462180

Log:
  Update CONFLICTS_INSTALL

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

Modified: head/textproc/rubygem-gitlab-linguist/Makefile
==============================================================================
--- head/textproc/rubygem-gitlab-linguist/Makefile	Sat Feb 17 17:51:20 2018	(r462179)
+++ head/textproc/rubygem-gitlab-linguist/Makefile	Sat Feb 17 17:51:25 2018	(r462180)
@@ -15,7 +15,7 @@ RUN_DEPENDS=	rubygem-charlock_holmes>=0.6.6:textproc/r
 		rubygem-mime-types1>=1.19:misc/rubygem-mime-types1
 
 # bin/linguist
-CONFLICTS_INSTALL=	qtchooser rubygem-github-linguist
+CONFLICTS_INSTALL=	qtchooser rubygem-github-linguist rubygem-github-linguist47
 
 NO_ARCH=	yes
 USE_RUBY=	yes