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, 13 insertions, 3 deletions

diff --git a/japanese/ack/Makefile b/japanese/ack/Makefile
index c3c1c1563ec3..a35b19ff2cde 100644
--- a/japanese/ack/Makefile
+++ b/japanese/ack/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Kanji code converter
 
-CONFLICTS_INSTALL=	p5-ack ack
+CONFLICTS_INSTALL=	p5-ack # /bin/ack
 
 ALL_TARGET=	ack
 CFLAGS+=	-Wno-error=return-type
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index 090befdbd211..37b0715ec17f 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -17,6 +17,8 @@ CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 		--with-backspace=bs --without-terminfo \
 		--enable-multi-charset=kanji
 
+CONFLICTS_INSTALL=	eterm zh-eterm # bin/Eterm
+
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index d43e9c34d810..27f4cbdd0740 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -19,6 +19,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bitops --enable-non-decimal-data
 MAKE_JOBS_UNSAFE=	yes
 
+CONFLICTS_INSTALL=	gawk # bin/gawk
+
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 6cf876933d78..b8836233c0c8 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -38,7 +38,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}/${PORTVERSION}
 INFO=		groff
 
-CONFLICTS=	groff mdocml
+CONFLICTS=	groff heirloom-doctools # bin/groff bin/hpftodit bin/indxbib
 
 TMAC_DISTNAME=	tmac-20030521_2
 TMACFILES=	tmac.orig_me tmac.vgrind \
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 6f586364f73a..1215085a28d8 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -27,6 +27,8 @@ ALL_TARGET=	${BINSTUFF} getmail
 MAKE_JOBS_UNSAFE=	yes
 INFO=		jed
 
+CONFLICTS_INSTALL=	jed # bin/jed
+
 JED_ROOT=	${DATADIR}
 BINSTUFF=	jed rgrep
 
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 10d87dfd24d8..46afb60ff09f 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -25,6 +25,8 @@ SUB_LIST=	KON16FONT=${KON16FONT} \
 USES=		cpe
 CPE_VENDOR=	ishikawa_mutsumi
 
+CONFLICTS_INSTALL=	ja-kon2-*dot # bin/fld
+
 OPTIONS_DEFINE=	DOCS
 
 # XXX Static libraries with PIE are currently unsupported.
diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index d9ae2fd32700..2e0a121aacaf 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -31,7 +31,7 @@ PORTDOCS=	00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \
 		INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
-CONFLICTS=	nmh
+CONFLICTS=	ali mmh nmh p5-Dist-Joseki # bin/ali bin/anno bin/burst bin/comp bin/dist bin/folder bin/folders bin/forw bin/inc
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index b3511b7969fc..3562c1ac43f4 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -14,6 +14,8 @@ MASTERDIR=	${.CURDIR}/../../deskutils/plan
 PLIST=	${WRKDIR}/PLIST
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
+CONFLICTS_INSTALL=	plan # bin/Killpland
+
 PORTDOCS=	plan_calEUC.ps
 
 OPTIONS_DEFINE=	DOCS