git: 476fe00d9054 - main - japanese/mecab-ipadic: Fix CONFLICTS_INSTALL

The branch main has been updated by mce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=476fe00d9054ebb53d094922637a64c9ce91452c

commit 476fe00d9054ebb53d094922637a64c9ce91452c
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-05 20:32:08 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-06 19:16:08 +0000

    japanese/mecab-ipadic: Fix CONFLICTS_INSTALL
    
    Switch from OPTIONS_RADIO to OPTIONS_SINGLE.
    Update pkg-descr.
    
    PR:             298135
    Approved by:    osa (mentor)
---
 japanese/mecab-ipadic/Makefile  | 14 +++++++-------
 japanese/mecab-ipadic/pkg-descr |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/japanese/mecab-ipadic/Makefile b/japanese/mecab-ipadic/Makefile
index 54b0a5ea978e..4043fcbd3c0e 100644
--- a/japanese/mecab-ipadic/Makefile
+++ b/japanese/mecab-ipadic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mecab-ipadic
 DISTVERSION=	2.7.0-20070801
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	https://sourceforge.net/projects/mecab/files/${PORTNAME}/${DISTVERSION}/ \
 		https://distfiles.sigtrap.nl/
@@ -11,12 +11,12 @@ WWW=		https://taku910.github.io/mecab/
 
 .if empty(PKGNAMESUFFIX)
 USES=		metaport
-OPTIONS_RADIO=	CHARSET
-OPTIONS_RADIO_CHARSET=	EUCJP SHIFTJIS UTF8
+OPTIONS_SINGLE=	CHARSET
+OPTIONS_SINGLE_CHARSET=	EUCJP SHIFTJIS UTF8
 OPTIONS_DEFAULT=UTF8
-EUCJP_DESC=	Use EUC-JP as dictionary charset.
-SHIFTJIS_DESC=	Use SHIFT-JIS as dictionary charset.
-UTF8_DESC=	Use UTF-8 as dictionary charset.
+EUCJP_DESC=	Use EUC-JP as dictionary charset
+SHIFTJIS_DESC=	Use SHIFT-JIS as dictionary charset
+UTF8_DESC=	Use UTF-8 as dictionary charset
 
 EUCJP_RUN_DEPENDS=	ja-mecab-ipadic-eucjp>0:japanese/mecab-ipadic-eucjp
 SHIFTJIS_RUN_DEPENDS=	ja-mecab-ipadic-sjis>0:japanese/mecab-ipadic-sjis
@@ -61,7 +61,7 @@ PLIST_FILES=	lib/mecab/dic/ipadic/char.bin \
 		lib/mecab/dic/ipadic/sys.dic \
 		lib/mecab/dic/ipadic/unk.dic
 
-CONFLICTS_INSTALL=	ja-mecab-ipadic*
+CONFLICTS_INSTALL=	ja-mecab-ipadic-[^0-9]*
 
 .endif # !empty(PKGNAMESUFFIX)
 
diff --git a/japanese/mecab-ipadic/pkg-descr b/japanese/mecab-ipadic/pkg-descr
index 4af0337acd4f..ddcc1f4e0ba2 100644
--- a/japanese/mecab-ipadic/pkg-descr
+++ b/japanese/mecab-ipadic/pkg-descr
@@ -1 +1,2 @@
-Japanese Morphological Dictionary for MeCab.
+Japanese Morphological Dictionary for MeCab created based on the corpus
+from the Innovation Platform Agency, Japan (IPA).