Update CONFLICTS definitions in categories a* to c*

Update the CONFLICTS definitions of ports in the following categories:

- accessibility
- archivers
- audio
- benchmarks
- biology
- cad
- chinese
- comms
- converters

An attempt has been made to use generic conflicts patterns that do not
have to be updated whenever a new version of a conflicting port is
added to the ports system.

There is a misunderstanding that the port being built/installed has to
be omitted from the conflicts pattern. This is not true - the port
being built is implicitly non-conflicting due to logic in bsd.port.mk.

Approved by:	portmgr (implicit)

17 files changed, 30 insertions, 5 deletions

diff --git a/chinese/cconv/Makefile b/chinese/cconv/Makefile
index 2824cb4a8431..87474cd2d386 100644
--- a/chinese/cconv/Makefile
+++ b/chinese/cconv/Makefile
@@ -19,6 +19,8 @@ USES=		autoreconf iconv libtool
 GH_ACCOUNT=	xiaoyjy
 USE_GITHUB=	yes
 
+CONFLICTS_INSTALL=	libunicode # include/unicode.h
+
 .include <bsd.port.pre.mk>
 
 .if !empty(ICONV_LIB)
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index da03bf342cc9..31a9f3201fdb 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -16,7 +16,7 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 
 USES+=		ghostscript:run
 
-CONFLICTS_INSTALL=	enscript-a4 enscript-letter enscript-letterdj
+CONFLICTS_INSTALL=	enscript-a4 enscript-letter enscript-letterdj py*-us # bin/einfo bin/xml2json
 
 post-patch:
 	@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index 764533d80514..cfd73d3ed0cc 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -14,7 +14,7 @@ CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 		--with-backspace=bs --without-terminfo \
 		--enable-multi-charset=big5
 
-CONFLICTS_INSTALL=	eterm ja-eterm
+CONFLICTS_INSTALL=	eterm eterm-bg ja-eterm # bin/Esetroot share/Eterm/pix/scale/Neopolis-horizon.jpg
 
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index 757f69186ade..c5d8701b560f 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -18,4 +18,6 @@ LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
 
 USES=		cmake gettext gnome pkgconfig tar:xz
 
+CONFLICTS_INSTALL=	zh-fcitx5-chewing # share/icons/hicolor/48x48/apps/fcitx-chewing.png
+
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile
index 64891cd34877..fa1725ae6c08 100644
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@@ -23,6 +23,8 @@ RUN_DEPENDS=	${_SCHEMA_DEPENDS}
 
 USES=		cmake gettext gnome localbase pkgconfig tar:xz
 
+CONFLICTS_INSTALL=	zh-fcitx5-rime # share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
+
 _SCHEMA_DEPENDS=	\
 	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
 	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
diff --git a/chinese/fcitx-table-extra/Makefile b/chinese/fcitx-table-extra/Makefile
index 4709965f6cc6..9e50eb8cb422 100644
--- a/chinese/fcitx-table-extra/Makefile
+++ b/chinese/fcitx-table-extra/Makefile
@@ -16,6 +16,8 @@ BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx
 
 USES=		cmake gettext gnome tar:xz
+
+CONFLICTS_INSTALL=	zh-fcitx5-table-extra # share/icons/hicolor/48x48/apps/fcitx-cantonese.png
 STRIP=
 
 .include <bsd.port.mk>
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index d0ca68f282b8..52292fd83244 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR=${PORTSDIR}
 
-CONFLICTS=	zh-scim-fcitx
+CONFLICTS_INSTALL=	fcitx5 zh-fcitx5-chinese-addons zh-scim-fcitx # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
 
 USE_GNOME=	pango intltool libxml2 introspection
 USE_KDE=	ecm
diff --git a/chinese/fcitx5-chewing/Makefile b/chinese/fcitx5-chewing/Makefile
index 46e771afcfad..d4d98f9b19af 100644
--- a/chinese/fcitx5-chewing/Makefile
+++ b/chinese/fcitx5-chewing/Makefile
@@ -20,4 +20,6 @@ GH_ACCOUNT=	fcitx
 
 USE_KDE=	ecm
 
+CONFLICTS_INSTALL=	zh-fcitx-chewing # share/icons/hicolor/48x48/apps/fcitx-chewing.png
+
 .include <bsd.port.mk>
diff --git a/chinese/fcitx5-chinese-addons/Makefile b/chinese/fcitx5-chinese-addons/Makefile
index a51e26c5e89e..c2b095cc7b0b 100644
--- a/chinese/fcitx5-chinese-addons/Makefile
+++ b/chinese/fcitx5-chinese-addons/Makefile
@@ -45,6 +45,8 @@ CMAKE_ON=	ENABLE_OPENCC
 CMAKE_OFF=	ENABLE_TEST
 MAKE_ENV=	FCITX5_DOWNLOAD_DISALLOWED=TRUE
 
+CONFLICTS_INSTALL=	zh-fcitx # share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
+
 # These must follow modules/pinyinhelper/CMakeLists.txt
 PY_STROKE_VER=	20121124
 PY_TABLE_VER=	20121124
diff --git a/chinese/fcitx5-rime/Makefile b/chinese/fcitx5-rime/Makefile
index 65252765aa35..70ec9c8430ed 100644
--- a/chinese/fcitx5-rime/Makefile
+++ b/chinese/fcitx5-rime/Makefile
@@ -23,6 +23,8 @@ GH_ACCOUNT=	fcitx
 
 USE_KDE=	ecm
 
+CONFLICTS_INSTALL=	zh-fcitx-rime # share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
+
 _SCHEMA_DEPENDS=	\
 	${LOCALBASE}/share/rime-data/luna_pinyin.schema.yaml:chinese/rime-luna-pinyin	\
 	${LOCALBASE}/share/rime-data/bopomofo.schema.yaml:chinese/rime-bopomofo	\
diff --git a/chinese/fcitx5-table-extra/Makefile b/chinese/fcitx5-table-extra/Makefile
index cfea252432e1..88392194cf3b 100644
--- a/chinese/fcitx5-table-extra/Makefile
+++ b/chinese/fcitx5-table-extra/Makefile
@@ -22,4 +22,6 @@ USE_KDE=	ecm
 
 INSTALL_TARGET=	install
 
+CONFLICTS_INSTALL=	zh-fcitx-table-extra # share/icons/hicolor/48x48/apps/fcitx-cantonese.png
+
 .include <bsd.port.mk>
diff --git a/chinese/fcitx5-table-other/Makefile b/chinese/fcitx5-table-other/Makefile
index d8dfd4757d5b..429be107854e 100644
--- a/chinese/fcitx5-table-other/Makefile
+++ b/chinese/fcitx5-table-other/Makefile
@@ -26,4 +26,6 @@ USE_KDE=	ecm
 
 INSTALL_TARGET=	install
 
+CONFLICTS_INSTALL=	fcitx-table-other # share/icons/hicolor/32x32/apps/fcitx-thai.png
+
 .include <bsd.port.mk>
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index 7e72d5f799d3..99a5a3328235 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
-CONFLICTS=	phpbb
+CONFLICTS_INSTALL=	phpbb phpbb3 zh-phpbb3-tw # share/doc/phpbb/AUTHORS share/doc/phpbb/CHANGELOG.html
 USES=		dos2unix php
 
 # Get HOSTNAME
diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile
index 86ec92e09149..1dc21e37c81d 100644
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The Traditional Chinese version of phpBB3
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-CONFLICTS=	phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]*
+CONFLICTS_INSTALL=	phpbb phpbb3 zh-phpbb-tw # share/doc/phpbb/AUTHORS share/doc/phpbb/CHANGELOG.html
 
 USES=		zip
 
diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile
index de33e07efddd..6cb42ddda8e1 100644
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@@ -4,6 +4,8 @@ CATEGORIES=	chinese
 
 MAINTAINER=	ports@FreeBSD.org
 
+CONFLICTS_INSTALL=	tin # bin/metamutt
+
 EXTRA_PATCHES=	${.CURDIR}/files/patch-attrib.c \
 		${.CURDIR}/files/patch-cook.c \
 		${.CURDIR}/files/patch-mail.c \
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 2dec8e2048dc..9fc0b127466b 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -18,6 +18,8 @@ USE_GNOME=	gtk20
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	reed talkfilters # bin/wrap
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile
index 42905005b317..dd9728e76cd4 100644
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@@ -20,6 +20,9 @@ USES=		cpe php:web
 CPE_VERSION=	${DISTVERSION}.0
 .endif
 USE_PHP=	curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
+
+CONFLICTS_INSTALL=	ja-wordpress wordpress # share/doc/wordpress/readme.html
+
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes
 NO_BUILD=	yes