From owner-svn-ports-head@freebsd.org  Sat Aug 10 22:52:08 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E36BC7ADB;
 Sat, 10 Aug 2019 22:52:08 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 465cn35pRSz4GlF;
 Sat, 10 Aug 2019 22:52:07 +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 856AA506F;
 Sat, 10 Aug 2019 22:52:07 +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 x7AMq7kP081635;
 Sat, 10 Aug 2019 22:52:07 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7AMq7Uv081634;
 Sat, 10 Aug 2019 22:52:07 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201908102252.x7AMq7Uv081634@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, 10 Aug 2019 22:52:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r508550 - head/www/rubygem-railties4
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: head/www/rubygem-railties4
X-SVN-Commit-Revision: 508550
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Aug 2019 22:52:08 -0000

Author: sunpoet
Date: Sat Aug 10 22:52:06 2019
New Revision: 508550
URL: https://svnweb.freebsd.org/changeset/ports/508550

Log:
  Update CONFLICTS_INSTALL

Modified:
  head/www/rubygem-railties4/Makefile

Modified: head/www/rubygem-railties4/Makefile
==============================================================================
--- head/www/rubygem-railties4/Makefile	Sat Aug 10 22:52:01 2019	(r508549)
+++ head/www/rubygem-railties4/Makefile	Sat Aug 10 22:52:06 2019	(r508550)
@@ -17,13 +17,13 @@ RUN_DEPENDS=	rubygem-actionpack4>=${PORTVERSION}:www/r
 		rubygem-rake>=0.8.7:devel/rubygem-rake \
 		rubygem-thor>=0.18.1:devel/rubygem-thor
 
-CONFLICTS_INSTALL=	rubygem-railties5 rubygem-railties50
-
 USES=		gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/rails
+
+CONFLICTS_INSTALL=	rubygem-railties5 rubygem-railties50 rubygem-railties52
 
 .include <bsd.port.mk>