summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED9
-rw-r--r--UPDATING25
-rw-r--r--japanese/Makefile3
-rw-r--r--japanese/anthy-unicode/Makefile2
-rw-r--r--japanese/anthy/Makefile77
-rw-r--r--japanese/anthy/distinfo7
-rw-r--r--japanese/anthy/files/patch-src-diclib-u2e.h29
-rw-r--r--japanese/anthy/files/patch-src-util_anthy.el38
-rw-r--r--japanese/anthy/pkg-descr6
-rw-r--r--japanese/anthy/pkg-plist31
-rw-r--r--japanese/fcitx-anthy/Makefile14
-rw-r--r--japanese/fcitx5-anthy/Makefile16
-rw-r--r--japanese/ibus-anthy/Makefile12
-rw-r--r--japanese/kasumi-unicode/Makefile2
-rw-r--r--japanese/kasumi/Makefile38
-rw-r--r--japanese/kasumi/distinfo2
-rw-r--r--japanese/kasumi/files/patch-KasumiDic.cxx10
-rw-r--r--japanese/kasumi/files/patch-KasumiException.hxx11
-rw-r--r--japanese/kasumi/files/patch-configure20
-rw-r--r--japanese/kasumi/pkg-descr1
-rw-r--r--japanese/kasumi/pkg-plist6
-rw-r--r--japanese/scim-anthy/Makefile8
-rw-r--r--japanese/scim-anthy/files/patch-configure11
-rw-r--r--japanese/uim-anthy-unicode/Makefile2
-rw-r--r--japanese/uim-anthy/Makefile47
-rw-r--r--japanese/uim-anthy/pkg-descr1
-rw-r--r--japanese/uim-anthy/pkg-plist8
27 files changed, 58 insertions, 378 deletions
diff --git a/MOVED b/MOVED
index ccaaf98bedf2..15c5f9af2db7 100644
--- a/MOVED
+++ b/MOVED
@@ -4562,3 +4562,12 @@ textproc/py-libxml2|textproc/libxml2-python|2025-06-28|Use correct Python packag
audio/carla||2025-06-29|Remove expired port. Depends on expired audio/py-pyliblo
audio/lmms||2025-06-29|Remove expired port. Depends on expiring audio/carla
audio/py-pyliblo||2025-06-29|Remove expired port. Upstream is inactive for over 9 years
+japanese/anthy|japanese/anthy-unicode|2025-06-29|Has expired: Use japanese/anthy-unicode instead
+japanese/kasumi|japanese/kasumi-unicode|2025-06-29|Has expired: Use japanese/kasumi-unicode instead
+japanese/uim-anthy|japanese/uim-anthy-unicode|2025-06-29|Has expired: Use japanese/uim-anthy-unicode instead
+japanese/fcitx-anthy@original|japanese/fcitx-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx-anthy@unicode|japanese/fcitx-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx5-anthy@original|japanese/fcitx5-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx5-anthy@unicode|japanese/fcitx5-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/ibus-anthy@original|japanese/ibus-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/ibus-anthy@unicode|japanese/ibus-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
diff --git a/UPDATING b/UPDATING
index 5d09cc390aff..b7bfe6eb39d9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,31 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20250629:
+ AFFECTS: users of japanese/anthy
+ AUTHOR: nobutaka@FreeBSD.org
+
+ japanese/anthy has been removed. Please use japanese/anthy-unicode as the
+ replacement.
+
+ japanese/anthy and japanese/anthy-unicode use different user dictionary
+ file location.
+
+ japanese/anthy: ~/.anthy/private_words_default
+ japanese/anthy-unicode: ~/.config/anthy/private_words_default
+
+ You can migrate your user dictionary for japanese/anthy with
+ anthy-dic-tool-unicode.
+
+ anthy-dic-tool-unicode --migrate
+
+ If you use the japanese-anthy or japanese-anthy-uim input method on Emacs,
+ please change them in your Emacs init file such as ~/.emacs.el and ~/.emacs
+ as follows:
+
+ japanese-anthy -> japanese-anthy-unicode
+ japanese-anthy-uim -> japanese-anthy-utf8-uim
+
20250627:
AFFECTS: users of finance/ktoblzcheck
AUTHOR: jhale@FreeBSD.org
diff --git a/japanese/Makefile b/japanese/Makefile
index ab1225a81b6d..a179bc9f1444 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -13,7 +13,6 @@
SUBDIR += ajaxzip2-data
SUBDIR += alias-fonts
SUBDIR += another-htmllint
- SUBDIR += anthy
SUBDIR += anthy-unicode
SUBDIR += aobook
SUBDIR += bible_names-fpw
@@ -142,7 +141,6 @@
SUBDIR += jls
SUBDIR += jvim3
SUBDIR += kakasi
- SUBDIR += kasumi
SUBDIR += kasumi-unicode
SUBDIR += kbanner
SUBDIR += kcc
@@ -280,7 +278,6 @@
SUBDIR += timidity++-slang
SUBDIR += today
SUBDIR += tomoe
- SUBDIR += uim-anthy
SUBDIR += uim-anthy-unicode
SUBDIR += uim-mozc
SUBDIR += uim-tomoe-gtk
diff --git a/japanese/anthy-unicode/Makefile b/japanese/anthy-unicode/Makefile
index fda11f8d7773..795a98ff9438 100644
--- a/japanese/anthy-unicode/Makefile
+++ b/japanese/anthy-unicode/Makefile
@@ -19,8 +19,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-CONFLICTS_INSTALL= ja-anthy
-
ELISPDIR= share/emacs/site-lisp/anthy-unicode
PLIST_SUB= ELISPDIR=${ELISPDIR}
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
deleted file mode 100644
index e0d0270c3b04..000000000000
--- a/japanese/anthy/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-PORTNAME= anthy
-PORTVERSION= 0.4
-PORTREVISION= 5
-PORTEPOCH= 1
-CATEGORIES= japanese
-MASTER_SITES= DEBIAN
-DISTFILES= ${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
-EXTRACT_ONLY= ${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
-
-MAINTAINER= nobutaka@FreeBSD.org
-COMMENT= Another Kana-Kanji conversion system
-WWW= https://salsa.debian.org/debian/anthy
-
-LICENSE= GPLv2 LGPL21
-LICENSE_COMB= multi
-LICENSE_FILE_GPLv2= ${WRKSRC}/alt-cannadic/COPYING
-LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING
-
-USES= iconv:patch libtool pathfix pkgconfig
-USE_LDCONFIG= yes
-
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-DOCSDIR= ${PREFIX}/share/doc/ja/anthy
-ELISPDIR= share/emacs/site-lisp/anthy
-PLIST_SUB= ELISPDIR=${ELISPDIR}
-
-CONFLICTS_INSTALL= ja-anthy-unicode
-
-OPTIONS_DEFINE= ODIC GSKKDIC DOCS
-
-ODIC_DESC= Okinawa Dictionary
-GSKKDIC_DESC= SKK Dictionary
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MODIC}
-MASTER_SITES+= http://www.ofug.net/~yamajun/files/:odic
-DISTFILES+= ${ODIC_SRCS}:odic
-ODIC_SRCS= ${ODIC_VERS}.t
-ODIC_VERS= okinawa-20070717
-.endif
-
-.if ${PORT_OPTIONS:MGSKKDIC}
-MASTER_SITES+= http://www.ohnolab.org/~kimoto/:gskk
-DISTFILES+= ${GSKK_SRCS}:gskk
-GSKK_SRCS= ${GSKK_VERS}.t.gz
-GSKK_VERS= gskk-20041208
-.endif
-
-post-extract:
-.if ${PORT_OPTIONS:MODIC}
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ODIC_SRCS} ${WRKSRC}/mkworddic
- ${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${ODIC_SRCS}\\n" | \
- ${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
-.endif
-
-.if ${PORT_OPTIONS:MGSKKDIC}
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/${GSKK_SRCS} ${WRKSRC}/mkworddic
- ${GUNZIP_CMD} ${WRKSRC}/mkworddic/${GSKK_SRCS}
- ${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${GSKK_VERS}.t\\n" | \
- ${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
-.endif
-
-post-patch:
- ${REINPLACE_CMD} -e \
- 's| install-lispLISP||g' ${WRKSRC}/src-util/Makefile.in
- ${CP} ${WRKSRC}/src-util/rkhelper.c ${WRKSRC}/src-util/rkhelper.c.orig
- ${ICONV_CMD} -f utf-8 -t euc-jp ${WRKSRC}/src-util/rkhelper.c.orig > ${WRKSRC}/src-util/rkhelper.c
-
-post-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}
- ${INSTALL_DATA} ${WRKSRC}/src-util/*.el ${STAGEDIR}${PREFIX}/${ELISPDIR}
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/ELISP ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/japanese/anthy/distinfo b/japanese/anthy/distinfo
deleted file mode 100644
index ca869ecf16b4..000000000000
--- a/japanese/anthy/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1569037948
-SHA256 (anthy_0.4.orig.tar.gz) = fdf590beea7093f3327b1eee76013e4936e4c6659e7cc01dd1fdd6e6f2e9c9f7
-SIZE (anthy_0.4.orig.tar.gz) = 5619024
-SHA256 (okinawa-20070717.t) = dd7c9d5e5bfe3f7632af3aa4dbf707da7578c1cd31a4d614944b26d6b194b204
-SIZE (okinawa-20070717.t) = 158199
-SHA256 (gskk-20041208.t.gz) = d366b0b76d8b39c33244aa289c758663c260ef4402eaf49f0f53d14d55efbad7
-SIZE (gskk-20041208.t.gz) = 760867
diff --git a/japanese/anthy/files/patch-src-diclib-u2e.h b/japanese/anthy/files/patch-src-diclib-u2e.h
deleted file mode 100644
index 2e437f285d7b..000000000000
--- a/japanese/anthy/files/patch-src-diclib-u2e.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src-diclib/u2e.h.orig 2019-07-05 02:37:13 UTC
-+++ src-diclib/u2e.h
-@@ -55,7 +55,7 @@ static const int u2e_8[] = {0x0,0xa7a7,0x8fa7c2,0x8fa7
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
- static const int u2e_64[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
--0xa1be,0x0,0x0,0x0,0x0,0xa1bd,0x0,0x0,0xa1c6,0xa1c7,0x0,0x0,0xa1c8,0xa1c9,0x0,0x0,
-+0xa1be,0x0,0x0,0x0,0xa1bd,0xa1bd,0xa1c2,0x0,0xa1c6,0xa1c7,0x0,0x0,0xa1c8,0xa1c9,0x0,0x0,
- 0xa2f7,0xa2f8,0x0,0x0,0x0,0xa1c5,0xa1c4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- 0xa2f3,0x0,0xa1ec,0xa1ed,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa2a8,0x0,0x0,0x0,0x0,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
-@@ -79,7 +79,7 @@ static const int u2e_67[] = {0x0,0x0,0x0,0x0,0x0,0x0,0
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
- static const int u2e_68[] = {0xa2cf,0x0,0xa2df,0xa2d0,0x0,0x0,0x0,0xa2e0,0xa2ba,0x0,0x0,0xa2bb,0x0,0x0,0x0,0x0,
--0x0,0xadf4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa2e5,0x0,0x0,0xa2e7,0xa1e7,0xadf8,
-+0x0,0xadf4,0xa1dd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa2e5,0x0,0x0,0xa2e7,0xa1e7,0xadf8,
- 0xa2dc,0x0,0x0,0x0,0x0,0xa1c2,0x0,0xa2ca,0xa2cb,0xa2c1,0xa2c0,0xa2e9,0xa2ea,0x0,0xadf3,0x0,
- 0x0,0x0,0x0,0x0,0xa1e8,0xa2e8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa2e6,0x0,0x0,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
-@@ -135,7 +135,7 @@ static const int u2e_76[] = {0x0,0x0,0x0,0x0,0x0,0xa1f
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa2f6,0x0,0x0,0xa2f5,0x0,0xa2f4,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
- static const int u2e_96[] = {0xa1a1,0xa1a2,0xa1a3,0xa1b7,0x0,0xa1b9,0xa1ba,0xa1bb,0xa1d2,0xa1d3,0xa1d4,0xa1d5,0xa1d6,0xa1d7,0xa1d8,0xa1d9,
--0xa1da,0xa1db,0xa2a9,0xa2ae,0xa1cc,0xa1cd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xade0,0x0,0xade1,
-+0xa1da,0xa1db,0xa2a9,0xa2ae,0xa1cc,0xa1cd,0x0,0x0,0x0,0x0,0x0,0x0,0xa1c1,0xade0,0x0,0xade1,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
- 0x0,0xa4a1,0xa4a2,0xa4a3,0xa4a4,0xa4a5,0xa4a6,0xa4a7,0xa4a8,0xa4a9,0xa4aa,0xa4ab,0xa4ac,0xa4ad,0xa4ae,0xa4af,
diff --git a/japanese/anthy/files/patch-src-util_anthy.el b/japanese/anthy/files/patch-src-util_anthy.el
deleted file mode 100644
index db8206b44b7f..000000000000
--- a/japanese/anthy/files/patch-src-util_anthy.el
+++ /dev/null
@@ -1,38 +0,0 @@
---- src-util/anthy.el.orig 2019-07-05 02:37:13 UTC
-+++ src-util/anthy.el
-@@ -71,7 +71,7 @@
- (defvar anthy-highlight-face nil)
- (defvar anthy-underline-face nil)
- (copy-face 'highlight 'anthy-highlight-face)
--(set-face-underline-p 'anthy-highlight-face t)
-+(set-face-underline 'anthy-highlight-face t)
- (copy-face 'underline 'anthy-underline-face)
-
- ;;
-@@ -745,7 +745,7 @@
- (if anthy-agent-process
- (kill-process anthy-agent-process))
- (setq anthy-agent-process proc)
-- (process-kill-without-query proc)
-+ (set-process-query-on-exit-flag proc nil)
- (if anthy-xemacs
- (if (coding-system-p (find-coding-system 'euc-japan))
- (set-process-coding-system proc 'euc-japan 'euc-japan))
-@@ -864,7 +864,7 @@
- ;; leim の activate
- ;;
- (defun anthy-leim-activate (&optional name)
-- (setq inactivate-current-input-method-function 'anthy-leim-inactivate)
-+ (setq deactivate-current-input-method-function 'anthy-leim-inactivate)
- (setq anthy-leim-active-p t)
- (anthy-update-mode)
- (when (eq (selected-window) (minibuffer-window))
-@@ -874,7 +874,7 @@
- ;; emacsのバグ避けらしいです
- ;;
- (defun anthy-leim-exit-from-minibuffer ()
-- (inactivate-input-method)
-+ (deactivate-input-method)
- (when (<= (minibuffer-depth) 1)
- (remove-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
-
diff --git a/japanese/anthy/pkg-descr b/japanese/anthy/pkg-descr
deleted file mode 100644
index 71f96befcc23..000000000000
--- a/japanese/anthy/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Anthy is a Japanese input method working on X11 and emacs.
-It converts Hiragana text to Kana Kanji mixed text.
-
-Supplemental 2ch BBS terms dictionary which is installed by WITH_2CHDIC knob
-is developed by Omaemona 2ch/Linux (DQN) Project.
-(http://omaemona.sourceforge.net/packages/Zisyo/)
diff --git a/japanese/anthy/pkg-plist b/japanese/anthy/pkg-plist
deleted file mode 100644
index 0052bb1e5265..000000000000
--- a/japanese/anthy/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-bin/anthy-agent
-bin/anthy-dic-tool
-etc/anthy-conf
-include/anthy/anthy.h
-include/anthy/dicutil.h
-include/anthy/input.h
-lib/libanthy.a
-lib/libanthy.so
-lib/libanthy.so.1
-lib/libanthy.so.1.1.2
-lib/libanthydic.a
-lib/libanthydic.so
-lib/libanthydic.so.1
-lib/libanthydic.so.1.1.3
-lib/libanthyinput.a
-lib/libanthyinput.so
-lib/libanthyinput.so.0
-lib/libanthyinput.so.0.0.0
-libdata/pkgconfig/anthy.pc
-%%DATADIR%%/anthy.dic
-%%DATADIR%%/dic-tool-usage.txt
-%%DATADIR%%/typetab
-%%DATADIR%%/zipcode.t
-%%PORTDOCS%%%%DOCSDIR%%/ELISP
-%%ELISPDIR%%/anthy-azik.el
-%%ELISPDIR%%/anthy-conf.el
-%%ELISPDIR%%/anthy-dic.el
-%%ELISPDIR%%/anthy-isearch.el
-%%ELISPDIR%%/anthy-kyuri.el
-%%ELISPDIR%%/anthy.el
-%%ELISPDIR%%/leim-list.el
diff --git a/japanese/fcitx-anthy/Makefile b/japanese/fcitx-anthy/Makefile
index 659b18dcf714..11a908cff815 100644
--- a/japanese/fcitx-anthy/Makefile
+++ b/japanese/fcitx-anthy/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fcitx-anthy
DISTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
@@ -13,19 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= bash:shells/bash \
fcitx:chinese/fcitx
-
-FLAVORS= original unicode
-FLAVOR?= ${FLAVORS:[1]}
+LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode
USES= cmake gettext gnome pkgconfig tar:xz
-.if ${FLAVOR} == original
-LIB_DEPENDS+= libanthy.so:japanese/anthy
-CONFLICTS_INSTALL= ${PORTNAME}-unicode
-.else
-PKGNAMESUFFIX= -unicode
-LIB_DEPENDS+= libanthy-unicode.so:japanese/anthy-unicode
-CONFLICTS_INSTALL= ${PORTNAME}
-.endif
-
.include <bsd.port.mk>
diff --git a/japanese/fcitx5-anthy/Makefile b/japanese/fcitx5-anthy/Makefile
index 4ca92df35480..940006821d03 100644
--- a/japanese/fcitx5-anthy/Makefile
+++ b/japanese/fcitx5-anthy/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fcitx5-anthy
DISTVERSION= 5.1.6
+PORTREVISION= 1
CATEGORIES= japanese textproc
MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
@@ -10,22 +11,11 @@ WWW= https://github.com/fcitx/fcitx5-anthy
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
-LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5
-
-FLAVORS= original unicode
-FLAVOR?= ${FLAVORS:[1]}
+LIB_DEPENDS= libFcitx5Core.so:textproc/fcitx5 \
+ libanthy-unicode.so:japanese/anthy-unicode
USES= cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig tar:zst
USE_KDE= ecm
-.if ${FLAVOR} == original
-LIB_DEPENDS+= libanthy.so:japanese/anthy
-CONFLICTS_INSTALL= ${PORTNAME}-unicode
-.else
-PKGNAMESUFFIX= -unicode
-LIB_DEPENDS+= libanthy-unicode.so:japanese/anthy-unicode
-CONFLICTS_INSTALL= ${PORTNAME}
-.endif
-
.include <bsd.port.mk>
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 8edf939d99a1..fc10a92e0856 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ibus-anthy
DISTVERSION= 1.5.17
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= https://github.com/ibus/ibus-anthy/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ja-
@@ -11,15 +12,8 @@ WWW= https://github.com/ibus/ibus-anthy
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libibus-1.0.so:textproc/ibus
-
-FLAVORS= original unicode
-
-original_LIB_DEPENDS= libanthy.so:japanese/anthy
-original_CONFLICTS_INSTALL= ${PORTNAME}-unicode
-unicode_PKGNAMESUFFIX= -unicode
-unicode_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode
-unicode_CONFLICTS_INSTALL= ${PORTNAME}
+LIB_DEPENDS= libibus-1.0.so:textproc/ibus \
+ libanthy-unicode.so:japanese/anthy-unicode
USES= gettext gmake gnome libtool pkgconfig python
USE_GNOME= pygobject3
diff --git a/japanese/kasumi-unicode/Makefile b/japanese/kasumi-unicode/Makefile
index fc9df44dc80d..fe1a6daccc59 100644
--- a/japanese/kasumi-unicode/Makefile
+++ b/japanese/kasumi-unicode/Makefile
@@ -19,8 +19,6 @@ USE_GNOME= gtk30
GNU_CONFIGURE= yes
-CONFLICTS_INSTALL= kasumi
-
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
deleted file mode 100644
index 48a894f0f089..000000000000
--- a/japanese/kasumi/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PORTNAME= kasumi
-PORTVERSION= 2.5
-PORTREVISION= 10
-CATEGORIES= japanese
-MASTER_SITES= OSDN/${PORTNAME}
-
-MAINTAINER= nobutaka@FreeBSD.org
-COMMENT= Dictionary management tool for anthy
-WWW= http://kasumi.sourceforge.jp/
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libanthy.so:japanese/anthy \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2
-
-USES= compiler:c++11-lang gmake gnome iconv:wchar_t localbase:ldflags pkgconfig
-USE_GNOME= gtk20 cairo gdkpixbuf
-USE_CXXSTD= c++11
-
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-OPTIONS_DEFINE= NLS
-
-CONFLICTS_INSTALL= kasumi-unicode
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-.include <bsd.port.mk>
diff --git a/japanese/kasumi/distinfo b/japanese/kasumi/distinfo
deleted file mode 100644
index 520d2e3bda68..000000000000
--- a/japanese/kasumi/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kasumi-2.5.tar.gz) = f21841ac9991e365abdb515e2c2a1ec9be5914fe8562f01e8571264ceb2528de
-SIZE (kasumi-2.5.tar.gz) = 279587
diff --git a/japanese/kasumi/files/patch-KasumiDic.cxx b/japanese/kasumi/files/patch-KasumiDic.cxx
deleted file mode 100644
index 3c9180dcc6db..000000000000
--- a/japanese/kasumi/files/patch-KasumiDic.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- KasumiDic.cxx.orig 2007-10-30 15:09:23 UTC
-+++ KasumiDic.cxx
-@@ -75,7 +75,6 @@ void KasumiDic::load(KasumiConfiguration *conf)
- const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency");
-
- int anthy_version = atoi(anthy_get_version_string());
-- assert(anthy_version != 0);
-
- try{
- if(anthy_priv_dic_select_first_entry() == -1){
diff --git a/japanese/kasumi/files/patch-KasumiException.hxx b/japanese/kasumi/files/patch-KasumiException.hxx
deleted file mode 100644
index a84e79e3fcf2..000000000000
--- a/japanese/kasumi/files/patch-KasumiException.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- KasumiException.hxx.orig 2006-05-26 17:41:25 UTC
-+++ KasumiException.hxx
-@@ -30,6 +30,8 @@
- #include "config.h"
- #endif
-
-+#include <string>
-+
- using namespace std;
-
- enum _output {STDOUT, STDERR, ERR_DIALOG, WARNING_DIALOG};
diff --git a/japanese/kasumi/files/patch-configure b/japanese/kasumi/files/patch-configure
deleted file mode 100644
index 93b88fad63e9..000000000000
--- a/japanese/kasumi/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2009-07-17 00:52:02 UTC
-+++ configure
-@@ -7365,7 +7365,7 @@ fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
-- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }"
- done
- fi
-
-@@ -8587,7 +8587,7 @@ fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
-- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }"
- done
- fi
-
diff --git a/japanese/kasumi/pkg-descr b/japanese/kasumi/pkg-descr
deleted file mode 100644
index 9df900a416d9..000000000000
--- a/japanese/kasumi/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Kasumi is a dictionary management tool for anthy kana-kanji conversion system.
diff --git a/japanese/kasumi/pkg-plist b/japanese/kasumi/pkg-plist
deleted file mode 100644
index c5631f648a5c..000000000000
--- a/japanese/kasumi/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/kasumi
-share/man/man1/kasumi.1.gz
-%%NLS%%share/locale/ja/LC_MESSAGES/kasumi.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kasumi.mo
-share/applications/kasumi.desktop
-share/pixmaps/kasumi.png
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 6502bc13f1cb..4fdb6396363e 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -1,6 +1,6 @@
PORTNAME= scim-anthy
PORTVERSION= 1.2.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= japanese
MASTER_SITES= OSDN/scim-imengine
@@ -12,14 +12,16 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= scim:textproc/scim
-LIB_DEPENDS= libanthy.so:japanese/anthy \
+LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
RUN_DEPENDS:= ${BUILD_DEPENDS} \
- kasumi:japanese/kasumi
+ kasumi:japanese/kasumi-unicode
USES= gettext-runtime gmake gnome iconv libtool:keepla pkgconfig
USE_GNOME= atk cairo gdkpixbuf glib20 gtk20 pango
GNU_CONFIGURE= yes
+CFLAGS+= -I${LOCALBASE}/include/anthy-unicode-1.0
+
.include <bsd.port.mk>
diff --git a/japanese/scim-anthy/files/patch-configure b/japanese/scim-anthy/files/patch-configure
new file mode 100644
index 000000000000..b0884c9f0e32
--- /dev/null
+++ b/japanese/scim-anthy/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2025-06-28 16:38:51 UTC
++++ configure
+@@ -31260,7 +31260,7 @@ fi
+ fi
+
+
+-ANTHY_LIBS="-lanthy -lanthydic"
++ANTHY_LIBS="-lanthy-unicode -lanthydic-unicode"
+ ANTHY_CFLAGS=""
+
+
diff --git a/japanese/uim-anthy-unicode/Makefile b/japanese/uim-anthy-unicode/Makefile
index a737bab1e8b1..1c4a26dc86ee 100644
--- a/japanese/uim-anthy-unicode/Makefile
+++ b/japanese/uim-anthy-unicode/Makefile
@@ -25,8 +25,6 @@ CONFIGURE_ARGS= --with-anthy-utf8
CONFIGURE_ARGS+= --with-gtk3 --enable-dict
.endif
-CONFLICTS_INSTALL= ja-uim-anthy
-
UIM_SLAVE= yes
do-build:
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
deleted file mode 100644
index 3e9bd2fda066..000000000000
--- a/japanese/uim-anthy/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-CATEGORIES= japanese
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX= -anthy-nox11
-.else
-PKGNAMESUFFIX= -anthy
-.endif
-
-COMMENT= Uim plugin using Anthy input method
-
-.if !defined(WITHOUT_X11)
-USE_GNOME= cairo gdkpixbuf gtk30
-.endif
-
-LIB_DEPENDS= libanthy.so:japanese/anthy \
- libfreetype.so:print/freetype2 \
- libuim.so:textproc/uim \
- libfontconfig.so:x11-fonts/fontconfig \
- libharfbuzz.so:print/harfbuzz
-
-MASTERDIR= ${.CURDIR}/../../textproc/uim
-PKGDIR= ${.CURDIR}
-CONFIGURE_ARGS= --with-anthy --with-anthy-utf8
-
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --with-gtk3 --enable-dict
-.endif
-
-CONFLICTS_INSTALL= ja-uim-anthy-unicode
-
-UIM_SLAVE= yes
-
-do-build:
- (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la)
- (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la)
-.if !defined(WITHOUT_X11)
- (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} uim-dict-gtk3)
-.endif
-
-do-install:
- (cd ${WRKSRC}/uim && \
- ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES && \
- ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la INSTALL_STRIP_FLAG=-s install-uim_pluginLTLIBRARIES)
-.if !defined(WITHOUT_X11)
- (cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 INSTALL_STRIP_FLAG=-s install-binPROGRAMS install-uim_dict_uiDATA)
-.endif
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-anthy/pkg-descr b/japanese/uim-anthy/pkg-descr
deleted file mode 100644
index 7ae2e7f1b2c8..000000000000
--- a/japanese/uim-anthy/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-uim plugin using Anthy input method.
diff --git a/japanese/uim-anthy/pkg-plist b/japanese/uim-anthy/pkg-plist
deleted file mode 100644
index 83c1562f00a6..000000000000
--- a/japanese/uim-anthy/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%X11%%bin/uim-dict-gtk3
-lib/uim/plugin/libuim-anthy.so
-lib/uim/plugin/libuim-anthy-utf8.so
-%%X11%%%%DATADIR%%/helperdata/uim-dict-ui.xml
-@postexec uim-module-manager --register anthy
-@postexec uim-module-manager --register anthy-utf8
-@preunexec uim-module-manager --unregister anthy
-@preunexec uim-module-manager --unregister anthy-utf8