svn commit: r454472 - in head: chinese/tintin++ net/tintin++

[Sunpoet Po-Chuan Hsieh]

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 at 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