Fix CONFLICTS entries of multiple ports

There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)

8 files changed, 15 insertions, 1 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 980de7604367..5a2a2f0df29d 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -15,6 +15,8 @@ USES=		gmake tar:bzip2 readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	lcn2
 
+CONFLICTS_INSTALL=	schilyutils # bin/calc
+
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff --git a/math/cbc/Makefile b/math/cbc/Makefile
index 19d93066eacd..cc8f0e07b0e9 100644
--- a/math/cbc/Makefile
+++ b/math/cbc/Makefile
@@ -32,6 +32,8 @@ GH_PROJECT=	Cbc
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-nauty-lib="-L${LOCALBASE}/lib -lnauty" --with-nauty-incdir=${LOCALBASE}/include/nauty
 
+CONFLICTS_INSTALL=	libcouchbase # bin/cbc
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
diff --git a/math/coq/Makefile b/math/coq/Makefile
index 0c236a0a76a7..96177465a171 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -36,6 +36,8 @@ CONFIGURE_ARGS=	-prefix ${PREFIX} \
 MAKE_ENV=	VERBOSE=1
 ALL_TARGET=	world
 
+CONFLICTS_INSTALL=	coq coq-emacs_* # bin/coq-tex bin/coq_makefile bin/coqc bin/coqchk bin/coqdep bin/coqdoc bin/coqide bin/coqmktop bin/coqtop bin/coqtop.byte bin/coqwc bin/coqworkmgr bin/gallina
+
 OPTIONS_DEFINE=		DOCS IDE
 OPTIONS_DEFAULT=	IDE
 OPTIONS_SUB=		yes
diff --git a/math/disco/Makefile b/math/disco/Makefile
index 919eb821f902..ba2c29ef1646 100644
--- a/math/disco/Makefile
+++ b/math/disco/Makefile
@@ -39,6 +39,8 @@ GH_PROJECT=	DisCO
 
 GNU_CONFIGURE=	yes
 
+CONFLICTS_INSTALL=	disco mono mono[0-9]*
+
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index 548812edbbe7..8203c1de40ba 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Shell calculator
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=	coreutils # bin/gexpr
+
 PLIST_FILES=	bin/gexpr man/man1/gexpr.1.gz
 
 post-patch:
diff --git a/math/latte-integrale/Makefile b/math/latte-integrale/Makefile
index 49ff1f479415..da6314f37f77 100644
--- a/math/latte-integrale/Makefile
+++ b/math/latte-integrale/Makefile
@@ -28,7 +28,7 @@ GH_ACCOUNT=	latte-int
 GH_PROJECT=	latte
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	latte
+CONFLICTS_INSTALL=	latte p5-Math-SigFigs schilyutils # bin/count
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile
index d2e9e4e829ea..e8540e9f3451 100644
--- a/math/p5-Math-SigFigs/Makefile
+++ b/math/p5-Math-SigFigs/Makefile
@@ -10,6 +10,8 @@ COMMENT=	Do math with correct handling of significant figures
 USES=		perl5
 USE_PERL5=	configure
 
+CONFLICTS_INSTALL=	latte latte-integrale schilyutils # # bin/count
+
 PLIST_FILES=	bin/count bin/format
 
 .include <bsd.port.mk>
diff --git a/math/topcom/Makefile b/math/topcom/Makefile
index 72d403737fd7..da468935fdc0 100644
--- a/math/topcom/Makefile
+++ b/math/topcom/Makefile
@@ -20,6 +20,8 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/cdd/
 LDFLAGS+=	-lgmp -lgmpxx -lcddgmp
 
+CONFLICTS_INSTALL=	p5-Set-CrossProduct # bin/cross
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 OPTIONS_DEFINE=		SOPLEX # SOPLEX shouldn't be made default because SoPlex's license prevents packaging.