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)

20 files changed, 28 insertions, 14 deletions

diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index b39afaabe8b1..98e80faad71f 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -34,7 +34,7 @@ MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-fcommon
 
-CONFLICTS_INSTALL=	fspclient
+CONFLICTS_INSTALL=	ocp publib
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/alliance/src
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index e185deca3fd2..5bb0db745f89 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 
-CONFLICTS=	kicad-4.*
+CONFLICTS_INSTALL=	kicad # bin/_cvpcb.kiface
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
diff --git a/cad/kicad-library-footprints-devel/Makefile b/cad/kicad-library-footprints-devel/Makefile
index a27010d975b6..b33d298c8c29 100644
--- a/cad/kicad-library-footprints-devel/Makefile
+++ b/cad/kicad-library-footprints-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
-CONFLICTS=	kicad-4.*
+CONFLICTS_INSTALL=	kicad-library-footprints # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
diff --git a/cad/kicad-library-footprints/Makefile b/cad/kicad-library-footprints/Makefile
index f17275cfcfd9..c2ea17440c1c 100644
--- a/cad/kicad-library-footprints/Makefile
+++ b/cad/kicad-library-footprints/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
-CONFLICTS=	kicad-devel-r2*
+CONFLICTS_INSTALL=	kicad-library-footprints-devel # share/kicad/footprints/Audio_Module.pretty/Reverb_BTDR-1H.kicad_mod
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-packages3d-devel/Makefile b/cad/kicad-library-packages3d-devel/Makefile
index f4b65c224a64..431d7302ec41 100644
--- a/cad/kicad-library-packages3d-devel/Makefile
+++ b/cad/kicad-library-packages3d-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
-CONFLICTS=	kicad-4.*
+CONFLICTS_INSTALL=	kicad-library-packages3d # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
diff --git a/cad/kicad-library-packages3d/Makefile b/cad/kicad-library-packages3d/Makefile
index 09605758d404..6371e64c4355 100644
--- a/cad/kicad-library-packages3d/Makefile
+++ b/cad/kicad-library-packages3d/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
-CONFLICTS=	kicad-devel-r2*
+CONFLICTS_INSTALL=	kicad-library-packages3d-devel # share/kicad/3dmodels/Battery.3dshapes/BatteryHolder_Bulgin_BX0036_1xC.step
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-symbols-devel/Makefile b/cad/kicad-library-symbols-devel/Makefile
index 45a3bf949622..d698b1e14a93 100644
--- a/cad/kicad-library-symbols-devel/Makefile
+++ b/cad/kicad-library-symbols-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
-CONFLICTS=	kicad-4.*
+CONFLICTS_INSTALL=	kicad-library-symbols # share/kicad/symbols/4xxx.kicad_sym
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
diff --git a/cad/kicad-library-symbols/Makefile b/cad/kicad-library-symbols/Makefile
index 7a627a0f5194..b0e607aa95c3 100644
--- a/cad/kicad-library-symbols/Makefile
+++ b/cad/kicad-library-symbols/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
-CONFLICTS=	kicad-devel-r2*
+CONFLICTS_INSTALL=	kicad-library-symbols-devel # share/kicad/symbols/4xxx.kicad_sym
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad-library-templates-devel/Makefile b/cad/kicad-library-templates-devel/Makefile
index b21287aca346..607062ed23ba 100644
--- a/cad/kicad-library-templates-devel/Makefile
+++ b/cad/kicad-library-templates-devel/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	kicad:cad/kicad-devel
 
-CONFLICTS=	kicad-4.*
+CONFLICTS_INSTALL=	kicad-library-tmpl # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
 
 USE_GITLAB=	nodefault
 GL_ACCOUNT=	kicad
diff --git a/cad/kicad-library-templates/Makefile b/cad/kicad-library-templates/Makefile
index 4508069eee61..5fa157ddef50 100644
--- a/cad/kicad-library-templates/Makefile
+++ b/cad/kicad-library-templates/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	kicad:cad/kicad
 
 USES=		cmake tar:bz2
 
-CONFLICTS=	kicad-devel-r2*
+CONFLICTS_INSTALL=	kicad-library-tmpl-devel # share/kicad/template/A2_ISO5457-1999_ISO7200-2004-compact_ASMEY1435-2014_EN.kicad_wks
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Release" \
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index bf3f71357a3d..f4828b6e8c5c 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl
 
-CONFLICTS=	kicad-devel-r201*
+CONFLICTS_INSTALL=	kicad-devel # bin/_cvpcb.kiface
 
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
 		gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
diff --git a/cad/netgen-lvs/Makefile b/cad/netgen-lvs/Makefile
index c14eb2d141a8..793b872b0cfb 100644
--- a/cad/netgen-lvs/Makefile
+++ b/cad/netgen-lvs/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	HAVE_PYTHON3=yes
 CONFIGURE_ARGS=	--with-interpreter=tcl --with-tcl=${LOCALBASE}/lib/tcl8.6 --with-tk=${LOCALBASE}/lib/tk8.6 --with-x
 
+CONFLICTS_INSTALL=	netgen # bin/netgen
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^#!/bin/env python3$$|#!${PYTHON_CMD}|' \
 		${WRKSRC}/python/*.py \
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index c4b15fd82dc5..9ab50e4fedd5 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -31,6 +31,8 @@ LDFLAGS+=	-lexecinfo
 
 CMAKE_OFF=	USE_NATIVE_ARCH
 
+CONFLICTS_INSTALL=	libvisual netgen-lvs pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so
+
 OPTIONS_DEFINE=	JPEG MPEG CGNS
 
 JPEG_DESC=	Enable snapshots using jpeg
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 7c34082f9c5b..4c2313bd1c87 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -72,6 +72,8 @@ CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	opencascade740 # OpenCAS/bin/DRAWEXE
+
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
diff --git a/cad/opencascade740/Makefile b/cad/opencascade740/Makefile
index 22f28ab929dc..164cd03b2f7b 100644
--- a/cad/opencascade740/Makefile
+++ b/cad/opencascade740/Makefile
@@ -57,6 +57,8 @@ CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	opencascade # OpenCAS/bin/DRAWEXE
+
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 56f3030608b2..3ad7848e7b90 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -27,8 +27,6 @@ LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
-#CONFLICTS=	openscad-devel
-
 USES=		bison compiler:c++14-lang cpe desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
@@ -41,6 +39,8 @@ QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
+CONFLICTS_INSTALL=	openscad-devel # bin/openscad
+
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 97858c445ae2..a9f68ecfe3aa 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -15,7 +15,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		bison:alias gmake localbase
 
-CONFLICTS=	gbase-0.* gmap-2015.*
+CONFLICTS_INSTALL=	gbase gmap # bin/gbase bin/gmap
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index 7c740fff0d7d..baa6033a4fda 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -30,6 +30,8 @@ GH_TUPLE=	\
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+CONFLICTS_INSTALL=	capnproto capnproto080 uhdm # bin/uhdm-dump lib/libcapnp.so
+
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
 OPTIONS_DEFINE=	PYTHON
diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile
index 5036ee684cb2..e4230f6968a7 100644
--- a/cad/uhdm/Makefile
+++ b/cad/uhdm/Makefile
@@ -21,6 +21,8 @@ GH_TUPLE=	capnproto:capnproto:14f24a4:capnproto/third_party/capnproto \
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+CONFLICTS_INSTALL=	capnproto capnproto080 surelog # bin/uhdm-dump lib/libcapnp.so
+
 BINARY_ALIAS=	tclsh=${TCLSH}
 
 .include <bsd.port.mk>
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index daf70aeb4721..0af06756f98c 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -23,6 +23,8 @@ NO_BUILD=	yes
 
 USES=		emacs:run
 
+CONFLICTS_INSTALL=	verilog-mode.el verilog-mode.el-emacs_* # share/emacs/site-lisp/verilog-mode.el
+
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 do-install: