From owner-svn-ports-head@freebsd.org  Sun Nov 19 03:31:29 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 AE47BDE948A;
 Sun, 19 Nov 2017 03:31:29 +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 7AE1A68F08;
 Sun, 19 Nov 2017 03:31:29 +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 vAJ3VSqA092381;
 Sun, 19 Nov 2017 03:31:28 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAJ3VSmh092379;
 Sun, 19 Nov 2017 03:31:28 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201711190331.vAJ3VSmh092379@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, 19 Nov 2017 03:31:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r454472 - in head: chinese/tintin++ net/tintin++
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: in head: chinese/tintin++ net/tintin++
X-SVN-Commit-Revision: 454472
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.25
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: Sun, 19 Nov 2017 03:31:29 -0000

Author: sunpoet
Date: Sun Nov 19 03:31:28 2017
New Revision: 454472
URL: https://svnweb.freebsd.org/changeset/ports/454472

Log:
  Mark CONFLICTS_INSTALL between net/tintin++ and chinese/tintin++

Modified:
  head/chinese/tintin++/Makefile
  head/net/tintin++/Makefile

Modified: head/chinese/tintin++/Makefile
==============================================================================
--- head/chinese/tintin++/Makefile	Sun Nov 19 02:38:29 2017	(r454471)
+++ head/chinese/tintin++/Makefile	Sun Nov 19 03:31:28 2017	(r454472)
@@ -8,6 +8,8 @@ MAINTAINER=	sunpoet@FreeBSD.org
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
+CONFLICTS_INSTALL=	tintin++
+
 MASTERDIR=	${.CURDIR}/../../net/tintin++
 
 OPTIONS_SLAVE=	BIG5

Modified: head/net/tintin++/Makefile
==============================================================================
--- head/net/tintin++/Makefile	Sun Nov 19 02:38:29 2017	(r454471)
+++ head/net/tintin++/Makefile	Sun Nov 19 03:31:28 2017	(r454472)
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/../COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
+CONFLICTS_INSTALL?=	zh-tintin++
+
 OPTIONS_DEFINE=	BIG5 DOCS
 BIG5_DESC=	Big5 support